summaryrefslogtreecommitdiff
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2019-06-24 12:07:22 +0100
committerMathew Inwood <mathewi@google.com>2019-07-16 11:58:49 +0100
commit80652db77ed733be00a18dd3308654343f5fec07 (patch)
tree63bd3eacfa6cabe2666a45bb7fdd2231b89a4108 /core/java/android/app/ActivityThread.java
parentd211a32119ec037f9a3365e1e2f871adad035f8b (diff)
Compatibility API implementation for app processes.
Pass the set of disabled changes from the system server into the app in the bindApplication() call. Use this to instantiate an implementation of Compatibility.Callbacks() to implement the API. Test: Manual. Bug: 135010838 Change-Id: I2fcf25264c62acc801f9e62967072cd04e4641e7
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index d741b610a0e2..2b4d4f8bc6eb 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -791,6 +791,8 @@ public final class ActivityThread extends ClientTransactionHandler {
@Nullable
ContentCaptureOptions contentCaptureOptions;
+ long[] disabledCompatChanges;
+
@Override
public String toString() {
return "AppBindData{appInfo=" + appInfo + "}";
@@ -1003,7 +1005,7 @@ public final class ActivityThread extends ClientTransactionHandler {
boolean isRestrictedBackupMode, boolean persistent, Configuration config,
CompatibilityInfo compatInfo, Map services, Bundle coreSettings,
String buildSerial, AutofillOptions autofillOptions,
- ContentCaptureOptions contentCaptureOptions) {
+ ContentCaptureOptions contentCaptureOptions, long[] disabledCompatChanges) {
if (services != null) {
if (false) {
// Test code to make sure the app could see the passed-in services.
@@ -1051,6 +1053,7 @@ public final class ActivityThread extends ClientTransactionHandler {
data.buildSerial = buildSerial;
data.autofillOptions = autofillOptions;
data.contentCaptureOptions = contentCaptureOptions;
+ data.disabledCompatChanges = disabledCompatChanges;
sendMessage(H.BIND_APPLICATION, data);
}
@@ -6144,10 +6147,10 @@ public final class ActivityThread extends ClientTransactionHandler {
if (data.trackAllocation) {
DdmVmInternal.enableRecentAllocations(true);
}
-
// Note when this process has started.
Process.setStartTimes(SystemClock.elapsedRealtime(), SystemClock.uptimeMillis());
+ AppCompatCallbacks.install(data.disabledCompatChanges);
mBoundApplication = data;
mConfiguration = new Configuration(data.config);
mCompatConfiguration = new Configuration(data.config);