tried decreasing sdk version to 28 and 29, cleaned the project many times and invalidated cache also but nothing happend
@KohlsAdrian @msndvlpr
On Android:
You have to replace
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
in the plugin build.gradle, not your flutter project, the plugin is found at
.pub-cache\hosted\pub.dartlang.org\flutter_plugin_android_lifecycle-1.0.8\android\build.gradle
On iOS:
In Runner.xcodeproj > project.pbxproj you have to remove some lines [Use VSCode for easy access]
Open it up and find in every release [Profile, Debug and Release] the property: OTHER_LDFLAGS
How you will find it:
OTHER_LDFLAGS = [
"$[inherited]",
"-framework",
Flutter,
"-ObjC",
"-l\"c++\"",
"-l\"sqlite3\"",
"-l\"z\"",
"-framework",
"\"AVFoundation\"",
"-framework",
"\"Accelerate\"",
"-framework",
"\"AudioToolbox\"",
"-framework",
"\"CFNetwork\"",
"-framework",
"\"CoreData\"",
"-framework",
"\"CoreGraphics\"",
"-framework",
"\"CoreImage\"",
"-framework",
"\"CoreLocation\"",
"-framework",
"\"CoreMedia\"",
"-framework",
"\"CoreTelephony\"",
"-framework",
"\"CoreText\"",
"-framework",
"\"CoreVideo\"",
"-framework",
"\"FIRAnalyticsConnector\"",
"-framework",
"\"FirebaseAnalytics\"",
"-framework",
"\"FirebaseCore\"",
"-framework",
"\"FirebaseCoreDiagnostics\"",
"-framework",
"\"FirebaseInstanceID\"",
"-framework",
"\"FirebaseMessaging\"",
"-framework",
"\"FirebaseStorage\"",
"-framework",
"\"Flutter\"",
"-framework",
"\"Foundation\"",
"-framework",
"\"GLKit\"",
"-framework",
"\"GTMSessionFetcher\"",
"-framework",
"\"GoogleAppMeasurement\"",
"-framework",
"\"GoogleDataTransport\"",
"-framework",
"\"GoogleDataTransportCCTSupport\"",
"-framework",
"\"GoogleMaps\"",
"-framework",
"\"GoogleMapsBase\"",
"-framework",
"\"GoogleMapsCore\"",
"-framework",
"\"GoogleMobileAds\"",
"-framework",
"\"GoogleUtilities\"",
"-framework",
"\"ImageIO\"",
"-framework",
"\"MediaPlayer\"",
"-framework",
"\"MessageUI\"",
"-framework",
"\"Metal\"",
"-framework",
"\"MobileCoreServices\"",
"-framework",
"\"OpenGLES\"",
"-framework",
"\"QuartzCore\"",
"-framework",
"\"Security\"",
"-framework",
"\"StoreKit\"",
"-framework",
"\"SystemConfiguration\"",
"-framework",
"\"UIKit\"",
"-framework",
"\"admob_flutter\"",
"-framework",
"\"clipboard_manager\"",
"-framework",
"\"device_info\"",
"-framework",
"\"firebase_analytics\"",
"-framework",
"\"firebase_core\"",
"-framework",
"\"firebase_messaging\"",
"-framework",
"\"firebase_storage\"",
"-framework",
"\"flutter_keyboard_visibility\"",
"-framework",
"\"flutter_plugin_android_lifecycle\"",
"-framework",
"\"flutter_speech\"",
"-framework",
"\"flutter_tts\"",
"-framework",
"\"geolocator\"",
"-framework",
"\"google_api_availability\"",
"-framework",
"\"google_maps_flutter\"",
"-framework",
"\"image_picker\"",
"-framework",
"\"location\"",
"-framework",
"\"location_permissions\"",
"-framework",
"\"nanopb\"",
"-framework",
"\"package_info\"",
"-framework",
"\"path_provider\"",
"-framework",
"\"permission_handler\"",
"-framework",
"\"protobuf\"",
"-framework",
"\"share\"",
"-framework",
"\"shared_preferences\"",
"-framework",
"\"url_launcher\"",
"-framework",
"\"webview_flutter\"",
"-weak_framework",
"\"AdSupport\"",
"-weak_framework",
"\"JavaScriptCore\"",
"-weak_framework",
"\"SafariServices\"",
"-weak_framework",
"\"UserNotifications\"",
"-weak_framework",
"\"WebKit\"",
];
How it must be:
OTHER_LDFLAGS = [
"$[inherited]",
"-framework",
Flutter,
];
Save it and you can build iOS and go good to go
Merge "Strengthen language about use of a11y API." into nyc-mr1-dev
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-6@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-7@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-8@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-9 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -12@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-16 # -hidden
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cppindex 4983b9a..c546072 100644
- a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
0
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
1
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
2
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
3
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
4
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
5
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
6
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
7
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
8
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
9
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-33@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-34@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-35@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-36 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -39@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-43 # -hidden
0
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-45@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-46@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-47@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-48 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -51@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-55 # -hidden
1
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-57@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-58@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-59@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-60 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -63@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-67 # -hidden
2
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-69@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-70@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-71@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-72 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -75@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-79 # -hidden
3
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-81@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-82@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-83@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-84 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -87@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-91 # -hidden
4
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-93@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-94@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-95@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-96 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -99@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-103 # -hidden
5
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-105@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-106@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-107@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-108 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -111@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-115 # -hidden
6
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-117@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-118@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-119@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-120 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -123@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-127 # -hidden
7
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-129@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-130@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-131@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-132 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -135@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-139 # -hidden
8
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-141@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-142@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-143@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-144 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -147@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-151 # -hidden
9
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
0
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
1
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
2
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
3
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
4
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
5
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
6
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
7
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
8
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
9
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
0
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
1
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
2
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
3
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
4
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
5
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
6
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
7
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
8
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
9
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
0
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
1
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
2
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
3
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
4
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
5
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
6
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
7
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
8
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
9
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
0
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
1
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
2
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
3
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
4
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
5
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
6
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
7
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
8
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
9
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
0
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
1
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
2
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
3
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
4
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
5
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
6
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
7
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
8
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
9
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
0
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
1
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
2
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
3
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
4
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
5
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
6
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
7
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
8
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
9
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
00
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
01
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
02
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
03
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
04
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
05
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
06
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
07
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
08
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
09
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
10
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
11
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
12
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
13
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
14
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
15
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
16
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
17
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
18
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
19
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
20
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
21
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
22
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
23
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
24
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
25
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
26
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
27
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
28
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
29
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
30
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
31
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
32
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
33
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
34
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
35
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
36
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
37
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
38
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
39
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
40
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
41
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
42
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
43
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
44
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
45
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
46
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
47
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
48
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
49
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
48
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
51
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
52
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
53
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
54
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
55
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
56
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
57
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
58
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
59
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
60
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
61
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
62
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
63
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
64
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
65
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
66
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
67
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
68
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
69
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
70
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
71
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
72
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
73
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
74
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
75
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
76
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
77
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
78
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
79
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
80
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
81
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
82
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
83
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
84
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
85
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
86
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
87
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
88
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
89
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
90
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
91
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
92
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
93
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
94
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
95
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
96
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
97
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
98
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
99
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-303@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-304@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-305@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-306 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -309@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-313 # -hidden
00
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-315@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-316@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-317@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-318 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -321@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-325 # -hidden
01
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-327@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-328@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-329@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-330 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -333@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-337 # -hidden
02
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-339@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-340@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-341@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-342 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -345@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-349 # -hidden
03
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-351@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-352@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-353@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-354 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -357@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-361 # -hidden
04
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-363@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-364@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-365@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-366 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -369@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-373 # -hidden
05
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-375@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-376@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-377@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-378 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -381@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-385 # -hidden
06
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-387@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-388@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-389@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-390 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -393@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-397 # -hidden
07
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-399@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-400@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-401@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-402 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -405@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-409 # -hidden
08
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-411@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-412@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-413@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-414 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -417@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-421 # -hidden
09
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-423@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-424@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-425@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-426 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -429@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-433 # -hidden
10
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-435@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-436@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-437@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-438 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -441@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-445 # -hidden
11
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-447@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-448@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-449@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-450 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -453@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-457 # -hidden
12
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-459@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-460@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-461@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-462 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -465@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-469 # -hidden
13
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-471@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-472@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-473@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-474 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -477@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-481 # -hidden
14
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-483@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-484@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-485@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-486 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -489@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-493 # -hidden
15
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-495@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-496@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-497@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-498 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -501@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-505 # -hidden
14
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-507@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-508@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-509@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-510 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -513@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-517 # -hidden
17
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-519@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-520@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-521@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-522 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -525@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-529 # -hidden
14
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-531@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-532@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-533@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-534 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -537@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-541 # -hidden
19
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-543@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-544@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-545@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-546 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -549@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-553 # -hidden
20
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-555@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-556@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-557@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-558 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -561@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-565 # -hidden
21
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-567@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-568@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-569@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-570 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -573@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-577 # -hidden
22
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-579@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-580@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-581@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-582 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -585@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-589 # -hidden
23
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-591@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-592@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-593@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-594 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -597@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-601 # -hidden
24
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-603@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-604@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-605@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-606 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -609@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-613 # -hidden
25
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-615@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-616@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-617@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-618 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -621@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-625 # -hidden
26
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-627@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-628@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-629@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-630 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -633@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-637 # -hidden
27
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-639@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-640@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-641@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-642 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -645@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-649 # -hidden
28
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-651@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-652@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-653@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-654 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -657@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-661 # -hidden
29
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-663@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-664@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-665@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-666 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -669@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-673 # -hidden
30
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-675@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-676@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-677@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-678 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -681@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-685 # -hidden
31
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-687@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-688@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-689@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-690 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -693@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-697 # -hidden
32
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-699@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-700@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-701@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-702 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -705@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-709 # -hidden
33
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-711@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-712@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-713@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-714 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -717@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-721 # -hidden
34
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-723@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-724@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-725@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-726 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -729@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-733 # -hidden
35
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-735@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-736@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-737@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-738 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -741@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-745 # -hidden
36
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-747@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-748@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-749@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-750 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -753@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-757 # -hidden
37
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-759@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-760@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-761@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-762 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -765@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-769 # -hidden
38
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-771@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-772@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-773@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-774 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -777@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-781 # -hidden
39
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-783@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-784@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-785@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-786 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -789@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-793 # -hidden
40
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-795@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-796@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-797@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-798 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -801@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-805 # -hidden
41
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-807@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-808@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-809@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-810 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -813@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-817 # -hidden
42
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-819@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-820@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-821@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-822 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -825@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-829 # -hidden
43
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-831@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-832@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-833@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-834 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -837@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-841 # -hidden
44
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-843@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-844@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-845@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-846 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -849@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-853 # -hidden
45
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-855@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-856@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-857@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-858 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -861@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-865 # -hidden
46
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-867@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-868@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-869@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-870 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -873@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-877 # -hidden
47
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-879@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-880@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-881@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-882 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -885@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-889 # -hidden
48
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-891@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-892@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-893@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-894 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -897@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-901 # -hidden
49
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-903@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-904@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-905@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-906 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -909@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-913 # -hidden
50
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-915@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-916@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-917@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-918 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -921@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-925 # -hidden
51
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-927@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-928@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-929@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-930 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -933@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-937 # -hidden
52
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-939@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-940@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-941@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-942 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -945@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-949 # -hidden
53
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-951@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-952@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-953@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-954 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -957@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-961 # -hidden
54
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-963@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-964@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-965@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-966 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -969@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-973 # -hidden
55
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-975@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-976@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-977@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-978 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -981@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-985 # -hidden
56
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-987@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-988@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-989@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-990 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -993@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-997 # -hidden
57
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-999@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1000@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1001@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1002 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1005@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1009 # -hidden
58
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1011@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1012@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1013@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1014 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1017@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1021 # -hidden
59
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1023@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1024@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1025@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1026 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1029@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1033 # -hidden
60
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1035@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1036@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1037@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1038 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1041@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1045 # -hidden
61
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1047@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1048@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1049@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1050 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1053@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1057 # -hidden
62
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1059@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1060@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1061@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1062 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1065@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1069 # -hidden
63
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1071@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1072@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1073@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1074 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1077@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1081 # -hidden
64
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1083@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1084@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1085@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1086 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1089@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1093 # -hidden
65
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1095@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1096@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1097@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1098 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1101@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1105 # -hidden
66
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1107@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1108@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1109@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1110 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1113@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1117 # -hidden
67
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1119@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1120@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1121@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1122 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1125@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1129 # -hidden
68
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1131@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1132@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1133@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1134 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1137@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1141 # -hidden
69
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1143@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1144@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1145@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1146 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1149@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1153 # -hidden
70
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1155@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1156@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1157@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1158 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1161@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1165 # -hidden
71
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1167@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1168@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1169@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1170 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1173@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1177 # -hidden
72
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1179@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1180@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1181@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1182 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1185@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1189 # -hidden
73
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1191@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1192@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1193@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1194 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1197@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1201 # -hidden
74
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1203@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1204@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1205@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1206 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1209@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1213 # -hidden
75
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1215@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1216@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1217@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1218 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1221@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1225 # -hidden
76
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1227@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1228@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1229@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1230 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1233@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1237 # -hidden
77
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1239@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1240@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1241@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1242 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1245@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1249 # -hidden
78
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1251@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1252@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1253@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1254 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1257@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1261 # -hidden
79
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1263@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1264@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1265@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1266 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1269@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1273 # -hidden
80
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1275@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1276@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1277@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1278 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1281@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1285 # -hidden
81
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1287@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1288@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1289@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1290 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1293@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1297 # -hidden
82
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1299@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1300@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1301@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1302 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1305@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1309 # -hidden
83
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1311@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1312@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1313@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1314 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1317@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1321 # -hidden
84
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1323@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1324@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1325@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1326 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1329@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1333 # -hidden
85
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1335@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1336@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1337@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1338 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1341@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1345 # -hidden
86
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1347@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1348@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1349@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1350 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1353@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1357 # -hidden
87
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1359@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1360@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1361@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1362 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1365@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1369 # -hidden
88
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1371@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1372@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1373@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1374 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1377@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1381 # -hidden
89
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1383@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1384@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1385@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1386 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1389@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1393 # -hidden
90
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1395@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1396@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1397@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1398 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1401@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1405 # -hidden
91
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1407@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1408@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1409@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1410 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1413@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1417 # -hidden
92
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1419@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1420@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1421@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1422 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1425@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1429 # -hidden
93
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1431@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1432@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1433@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1434 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1437@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1441 # -hidden
94
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1443@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1444@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1445@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1446 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1449@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1453 # -hidden
95
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1455@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1456@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1457@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1458 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1461@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1465 # -hidden
96
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1467@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1468@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1469@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1470 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1473@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1477 # -hidden
97
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1479@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1480@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1481@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1482 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1485@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1489 # -hidden
98
@@ -63,6 +63,7 @@ core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \ core/java/android/accounts/IAccountManager.aidl \ core/java/android/accounts/IAccountManagerResponse.aidl \
- core/java/android/accounts/IAccountAccessTracker.aidl \
core/java/android/accounts/IAccountAuthenticator.aidl \ core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ core/java/android/app/IActivityContainer.aidl \ @@ -897,7 +898,7 @@
SDK version identifiers used in the published docs
major[.minor] version for current SDK. [full releases only]
-framework_docs_SDK_VERSION:=6.0 +framework_docs_SDK_VERSION:=7.0
release version [ie "Release x"] [full releases only]
framework_docs_SDK_REL_ID:=1
@@ -906,7 +907,7 @@
-hdf sdk.preview.version 5 \ -hdf sdk.version $[framework_docs_SDK_VERSION] \ -hdf sdk.rel.id $[framework_docs_SDK_REL_ID] \
- -hdf sdk.preview 1
- -hdf sdk.preview 0
==== the api stubs and current.xml ===========================
include $[CLEAR_VARS] @@ -926,6 +927,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1491@@ -959,6 +961,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1492@@ -993,6 +996,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1493@@ -1026,6 +1030,7 @@
LOCAL_DROIDDOC_OPTIONS:=-1494 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk @@ -1064,7 +1069,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-sdkvalues $[OUT_DOCS] \ -hdf android.whichdoc offline
include $[BUILD_DROIDDOC]
@@ -1107,7 +1112,7 @@
static_doc_index_redirect := $[out_dir]/index.html $[static_doc_index_redirect]: \ - $[LOCAL_PATH]/docs/docs-preview-index.html | $[ACP]
- $[LOCAL_PATH]/docs/docs-documentation-redirect.html | $[ACP]
$[hide] mkdir -p $[dir $@] $[hide] $[ACP] $< $@
@@ -1139,7 +1144,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1163,6 +1168,7 @@
LOCAL_DROIDDOC_OPTIONS:= -1497@@ -1206,7 +1212,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-hdf android.hasSamples true \ -samplesdir $[samples_dir]
include $[BUILD_DROIDDOC]
@@ -1234,7 +1240,7 @@
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-devsite \ -ignoreJdLinks
include $[BUILD_DROIDDOC]
@@ -1259,11 +1265,10 @@
-toroot / \ -hdf android.whichdoc online \ $[sample_groups] \
- -useUpdatedTemplates \
-hdf android.hasSamples true \
-samplesdir $[samples_dir]
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-dev
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
include $[BUILD_DROIDDOC]
@@ -1282,6 +1287,7 @@ LOCAL_MODULE := hidden LOCAL_DROIDDOC_OPTIONS:=-1501 # -hidden
99
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
00
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
01
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
02
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
03
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
04
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
05
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
06
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
07
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
08
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
09
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
10
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
11
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
12
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
13
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
10
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
15
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
16
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
17
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
18
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
19
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
20
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
21
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
22
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
23
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
24
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
25
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
26
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
27
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
28
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
29
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
30
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
31
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
32
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
33
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
34
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
35
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
36
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
37
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
38
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
39
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
40
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
41
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
42
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
43
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
44
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
45
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
46
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
47
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
48
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
49
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
50
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
51
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
52
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
53
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
54
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
55
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
56
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
57
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
58
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
59
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
60
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
61
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
62
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
63
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
64
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
65
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
66
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
67
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
68
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
69
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
70
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
71
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
72
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
73
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
74
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
75
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
76
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
77
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
78
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
79
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
80
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
81
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
82
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
83
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
78
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
85
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
86
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
87
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
78
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
89
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
90
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
91
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
78
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
93
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
94
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
95
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
78
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
97
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
98
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
99
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
78
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
diff git a/cmds/bootanimation/audioplay.cpp b/cmds/bootanimation/audioplay.cpp index 4983b9a..c546072 100644 - a/cmds/bootanimation/audioplay.cpp +++ b/cmds/bootanimation/audioplay.cpp
78
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
@@ -141,13 +141,27 @@
// configure audio source
SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
- // Determine channelMask from num_channels
- SLuint32 channelMask;
- switch [chunkFormat->num_channels] {
- case 1:
- channelMask = SL_SPEAKER_FRONT_CENTER;
- break;
- case 2:
- channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
- break;
- default:
- // Default of 0 will derive mask from num_channels and log a warning.
- channelMask = 0;
- }
+
SLDataFormat_PCM format_pcm = { SL_DATAFORMAT_PCM, chunkFormat->num_channels, chunkFormat->sample_rate * 1000, // convert to milliHz chunkFormat->bits_per_sample, 16,
- SL_SPEAKER_FRONT_CENTER,
- channelMask, SL_BYTEORDER_LITTLEENDIAN }; SLDataSource audioSrc = {&loc_bufq, &format_pcm};
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
00
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
01
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
02
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
03
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
04
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
05
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
06
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
07
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
08
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
09
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
10
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
11
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
12
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
13
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
14
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
15
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
16
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
17
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
18
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
19
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
20
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
21
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
22
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
23
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
24
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
25
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
26
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
27
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
28
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
29
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
30
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
31
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
32
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
33
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
34
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
35
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
36
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
37
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
38
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
39
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
40
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
41
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
42
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
43
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
44
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
45
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
46
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
47
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
48
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
49
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
50
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
51
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
52
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
53
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
54
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
55
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
56
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
57
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
58
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
59
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
60
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
61
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
62
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
63
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
64
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
65
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
66
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
67
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
68
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
69
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
70
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
71
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
72
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
73
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
74
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
75
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
76
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
77
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
78
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
79
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
80
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
81
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
82
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
83
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
84
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
85
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
86
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
87
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
88
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
89
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
90
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
91
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
92
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
93
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
94
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
95
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
96
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
97
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
98
diff git a/cmds/wm/src/com/android/commands/wm/Wm.java b/cmds/wm/src/com/android/commands/wm/Wm.java index f7f7c88..383cd01 100644 - a/cmds/wm/src/com/android/commands/wm/Wm.java +++ b/cmds/wm/src/com/android/commands/wm/Wm.java
99
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
00
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
01
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
02
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
03
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
04
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
05
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
06
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
07
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
08
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
09
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
10
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
11
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
12
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
13
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
14
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
15
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
16
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
17
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
18
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
19
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
20
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
21
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
22
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
23
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
24
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
25
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
26
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
27
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
28
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
29
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
30
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
31
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
32
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
33
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
34
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
35
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
36
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
37
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
38
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
39
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
40
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
41
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
42
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
43
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
44
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
45
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
46
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
47
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
48
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
49
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
50
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
51
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
52
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
53
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
54
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
55
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
56
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
57
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
58
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
59
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
60
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
61
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
62
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
63
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
64
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
65
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
66
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
67
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
68
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
69
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
70
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
71
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
72
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
73
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
74
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
75
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
76
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
77
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
78
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
79
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
80
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
81
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
82
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
83
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
84
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
85
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
86
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
87
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
88
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
89
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
90
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
91
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
92
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
93
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
94
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
95
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
96
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
97
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
98
@@ -23,6 +23,7 @@ import android.graphics.Rect; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.AndroidException; import android.util.DisplayMetrics; import android.view.Display; @@ -201,9 +202,11 @@ try {
if [density > 0] {
// TODO[multidisplay]: For now Configuration only applies to main screen.
- mWm.setForcedDisplayDensity[Display.DEFAULT_DISPLAY, density];
- mWm.setForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY, density,
- UserHandle.USER_CURRENT];
} else {
- mWm.clearForcedDisplayDensity[Display.DEFAULT_DISPLAY];
- mWm.clearForcedDisplayDensityForUser[Display.DEFAULT_DISPLAY,
- UserHandle.USER_CURRENT]; } } catch [RemoteException e] { }
99
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
00
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
01
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
02
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
03
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
04
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
05
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
06
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
07
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
08
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
09
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
10
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
11
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
12
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
13
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
14
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
15
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
16
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
17
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
18
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
19
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
20
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
21
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
22
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
23
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
24
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
25
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
26
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
27
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
28
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
29
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
30
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
31
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
32
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
33
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
34
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
35
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
36
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
37
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
38
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
39
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
40
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
41
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
42
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
43
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
44
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
45
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
46
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
47
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
48
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
49
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
50
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
51
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
52
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
53
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
54
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
55
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
56
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
57
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
58
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
59
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
60
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
61
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
62
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
63
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
64
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
65
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
66
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
67
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
68
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
69
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
70
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
71
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
72
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
73
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
74
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
75
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
76
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
77
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
78
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
79
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
80
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
81
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
82
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
83
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
84
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
85
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
86
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
87
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
88
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
89
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
90
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
91
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
92
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
93
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
94
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
95
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
96
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
97
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
98
diff git a/core/java/android/accounts/Account.java b/core/java/android/accounts/Account.java index 7b83a30..6c16e32 100644 - a/core/java/android/accounts/Account.java +++ b/core/java/android/accounts/Account.java
99
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
00
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
01
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
02
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
03
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
04
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
05
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
06
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
07
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
08
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
09
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
10
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
11
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
12
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
13
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
14
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
15
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
16
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
17
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
18
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
19
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
20
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
21
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
22
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
23
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
24
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
25
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
26
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
27
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
28
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
29
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
30
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
31
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
32
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
33
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
34
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
35
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
36
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
37
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
38
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
39
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
40
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
41
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
42
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
43
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
44
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
45
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
46
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
45
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
48
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
45
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
50
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
51
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
52
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
53
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
54
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
55
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
56
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
57
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
58
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
59
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
60
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
61
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
62
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
63
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
64
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
65
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
66
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
67
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
68
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
69
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
70
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
71
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
72
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
73
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
74
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
75
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
76
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
77
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
78
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
79
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
80
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
81
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
82
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
83
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
84
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
85
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
86
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
87
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
88
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
89
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
90
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
91
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
92
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
93
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
94
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
95
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
96
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
97
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
98
@@ -16,9 +16,17 @@
package android.accounts;
+import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Parcelable; import android.os.Parcel; +import android.os.RemoteException; import android.text.TextUtils; +import android.util.ArraySet; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; + +import java.util.Set;
/
- Value type that represents an Account in the {@link AccountManager}. This object is @@ -26,8 +34,14 @@
- suitable for use as the key of a {@link java.util.Map}
*/ public class Account implements Parcelable {
- private static final String TAG = "Account"; +
- @GuardedBy["sAccessedAccounts"]
- private static final Set sAccessedAccounts = new ArraySet[];
+
public final String name; public final String type;
- private final @Nullable IAccountAccessTracker mAccessTracker;
@@ -44,6 +58,20 @@public boolean equals[Object o] { if [o == this] return true;
}
public Account[String name, String type] {
- this[name, type, null];
- } +
- /
- * @hide
- */
- public Account[@NonNull Account other, @Nullable IAccountAccessTracker accessTracker] {
- this[other.name, other.type, accessTracker];
- } +
- /
- * @hide
- */
- public Account[String name, String type, IAccountAccessTracker accessTracker] {
@@ -52,11 +80,29 @@if [TextUtils.isEmpty[name]] { throw new IllegalArgumentException["the name must not be empty: " + name]; }
} this.name = name; this.type = type;
- this.mAccessTracker = accessTracker;
}
public Account[Parcel in] { this.name = in.readString[]; this.type = in.readString[];
- this.mAccessTracker = IAccountAccessTracker.Stub.asInterface[in.readStrongBinder[]];
- if [mAccessTracker != null] {
- synchronized [sAccessedAccounts] {
- if [sAccessedAccounts.add[this]] {
- try {
- mAccessTracker.onAccountAccessed[];
- } catch [RemoteException e] {
- Log.e[TAG, "Error noting account access", e];
- }
- }
- }
- }
- } +
- / @hide */
- public IAccountAccessTracker getAccessTracker[] {
- return mAccessTracker;
}
@@ -66,6 +112,7 @@public int describeContents[] {
public void writeToParcel[Parcel dest, int flags] { dest.writeString[name]; dest.writeString[type];
- dest.writeStrongInterface[mAccessTracker];
}
public static final Creator CREATOR = new Creator[] {
99
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
00
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
01
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
02
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
03
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
04
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
05
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
06
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
07
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
08
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
09
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
10
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
11
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
12
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
13
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
14
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
15
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
16
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
17
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
18
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
19
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
20
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
21
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
22
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
23
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
24
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
25
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
26
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
27
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
28
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
29
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
30
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
31
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
32
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
29
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
34
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
35
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
36
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
37
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
38
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
39
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
40
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
41
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
42
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
43
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
44
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
45
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
46
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
47
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
48
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
49
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
50
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
51
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
52
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
53
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
54
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
55
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
56
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
57
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
58
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
59
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
60
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
61
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
62
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
63
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
64
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
65
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
66
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
67
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
68
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
69
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
70
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
71
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
72
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
73
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
74
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
75
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
76
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
77
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
78
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
79
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
80
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
81
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
82
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
83
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
84
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
85
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
86
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
87
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
88
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
89
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
90
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
91
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
92
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
93
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
94
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
95
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
96
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
97
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
98
diff git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index ed08a70..632e4b9 100644 - a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java
99
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
000
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
001
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
002
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
003
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
004
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
005
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
006
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
007
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
008
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
009
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
010
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
011
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
012
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
013
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
014
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
015
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
016
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
017
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
018
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
019
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
020
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
021
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
022
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
023
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
024
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
025
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
026
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
027
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
028
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
029
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
030
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
031
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
032
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
033
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
034
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
035
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
036
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
037
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
038
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
039
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
040
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
041
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
042
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
043
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
044
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
045
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
046
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
045
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
048
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
045
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
050
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
051
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
052
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
053
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
054
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
055
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
056
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
057
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
058
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
059
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
060
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
061
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
062
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
063
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
064
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
065
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
066
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
067
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
068
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
069
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
070
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
071
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
072
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
073
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
074
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
075
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
076
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
077
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
078
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
079
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
080
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
081
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
082
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
083
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
084
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
085
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
086
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
087
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
088
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
089
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
090
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
091
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
092
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
093
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
094
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
095
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
096
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
097
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
098
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
099
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
100
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
101
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
102
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
103
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
104
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
105
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
106
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
107
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
108
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
109
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
110
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
111
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
112
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
113
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
114
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
115
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
116
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
117
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
118
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
119
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
120
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
121
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
122
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
123
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
124
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
125
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
126
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
127
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
128
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
129
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
130
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
131
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
132
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
129
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
134
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
135
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
136
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
137
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
138
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
139
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
140
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
141
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
142
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
143
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
144
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
145
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
146
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
147
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
148
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
149
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
150
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
151
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
152
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
153
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
154
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
155
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
156
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
157
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
158
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
159
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
160
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
161
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
162
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
163
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
164
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
165
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
166
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
167
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
168
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
169
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
170
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
171
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
172
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
173
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
174
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
175
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
176
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
177
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
178
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
179
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
180
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
181
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
182
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
183
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
184
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
185
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
186
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
187
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
188
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
189
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
190
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
191
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
192
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
193
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
194
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
195
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
196
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
197
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
198
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
199
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
200
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
201
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
202
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
203
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
204
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
205
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
206
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
207
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
208
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
209
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
210
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
211
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
212
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
213
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
214
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
215
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
216
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
217
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
218
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
219
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
220
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
221
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
222
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
223
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
224
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
225
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
226
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
227
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
228
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
229
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
230
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
231
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
232
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
233
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
234
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
235
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
236
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
237
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
238
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
239
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
240
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
241
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
242
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
243
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
244
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
245
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
246
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
247
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
248
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
249
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
250
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
251
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
252
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
253
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
254
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
255
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
256
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
257
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
258
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
259
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
260
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
261
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
262
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
263
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
264
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
265
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
266
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
267
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
268
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
269
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
270
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
271
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
272
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
273
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
274
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
275
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
276
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
277
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
278
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
279
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
280
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
281
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
282
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
283
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
284
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
285
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
286
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
287
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
288
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
289
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
290
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
291
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
292
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
293
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
294
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
295
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
296
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
297
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
298
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
299
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
300
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
301
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
302
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
303
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
304
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
305
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
306
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
307
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
308
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
309
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
310
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
311
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
312
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
313
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
314
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
315
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
316
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
317
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
318
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
319
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
320
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
321
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
322
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
323
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
324
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
325
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
326
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
327
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
328
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
329
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
330
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
331
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
332
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
333
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
334
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
335
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
336
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
337
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
338
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
339
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
340
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
341
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
342
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
343
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
344
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
345
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
346
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
347
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
348
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
349
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
350
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
351
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
352
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
353
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
354
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
355
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
356
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
357
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
358
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
359
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
360
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
361
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
362
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
363
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
364
diff git a/Android.mk b/Android.mk index 9dc4aef..2d52854 100644 - a/Android.mk +++ b/Android.mk
365