resolved conflicts for merge of 8fb82074 to master

Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb

1 files changed, 12 insertions, 7 deletions

diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java
index 5b120cd5a941..f164a0a76d8f 100644
--- a/core/java/android/app/ApplicationThreadNative.java
+++ b/core/java/android/app/ApplicationThreadNative.java
@@ -293,6 +293,7 @@ public abstract class ApplicationThreadNative extends Binder
             int testMode = data.readInt();
             boolean enableBinderTracking = data.readInt() != 0;
             boolean openGlTrace = data.readInt() != 0;
+            boolean trackAllocation = data.readInt() != 0;
             boolean restrictedBackupMode = (data.readInt() != 0);
             boolean persistent = (data.readInt() != 0);
             Configuration config = Configuration.CREATOR.createFromParcel(data);
@@ -301,7 +302,8 @@ public abstract class ApplicationThreadNative extends Binder
             Bundle coreSettings = data.readBundle();
             bindApplication(packageName, info, providers, testName, profilerInfo, testArgs,
                     testWatcher, uiAutomationConnection, testMode, enableBinderTracking,
-                    openGlTrace, restrictedBackupMode, persistent, config, compatInfo, services, coreSettings);
+                    openGlTrace, trackAllocation, restrictedBackupMode, persistent, config,
+                    compatInfo, services, coreSettings);
             return true;
         }
 
@@ -1010,13 +1012,15 @@ class ApplicationThreadProxy implements IApplicationThread {
         data.recycle();
     }
 
+    @Override
     public final void bindApplication(String packageName, ApplicationInfo info,
-                                      List<ProviderInfo> providers, ComponentName testName, ProfilerInfo profilerInfo,
-                                      Bundle testArgs, IInstrumentationWatcher testWatcher,
-                                      IUiAutomationConnection uiAutomationConnection, int debugMode,
-                                      boolean enableBinderTracking, boolean openGlTrace, boolean restrictedBackupMode, boolean persistent,
-                                      Configuration config, CompatibilityInfo compatInfo, Map<String, IBinder> services,
-                                      Bundle coreSettings) throws RemoteException {
+            List<ProviderInfo> providers, ComponentName testName, ProfilerInfo profilerInfo,
+            Bundle testArgs, IInstrumentationWatcher testWatcher,
+            IUiAutomationConnection uiAutomationConnection, int debugMode,
+            boolean enableBinderTracking, boolean openGlTrace, boolean trackAllocation,
+            boolean restrictedBackupMode, boolean persistent, Configuration config,
+            CompatibilityInfo compatInfo, Map<String, IBinder> services,
+            Bundle coreSettings) throws RemoteException {
         Parcel data = Parcel.obtain();
         data.writeInterfaceToken(IApplicationThread.descriptor);
         data.writeString(packageName);
@@ -1040,6 +1044,7 @@ class ApplicationThreadProxy implements IApplicationThread {
         data.writeInt(debugMode);
         data.writeInt(enableBinderTracking ? 1 : 0);
         data.writeInt(openGlTrace ? 1 : 0);
+        data.writeInt(trackAllocation ? 1 : 0);
         data.writeInt(restrictedBackupMode ? 1 : 0);
         data.writeInt(persistent ? 1 : 0);
         config.writeToParcel(data, 0);