From b5e603f2705dbb6a2dc79d8d2e28b56bc862ff71 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Tue, 15 Nov 2016 16:26:06 -0800 Subject: [PATCH] Temporary enable Build#SERIAL Filed STOPSHIP b/32918547 bug:31803186 Change-Id: I66b26e5948d19391513e007daad099f51cb64155 --- .../java/com/android/server/am/ActivityManagerService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index e080fd971da17..238e2b43feb09 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -6490,11 +6490,12 @@ public class ActivityManagerService extends IActivityManager.Stub // SDK can see it. Since access to the serial is now behind a // permission we push down the value. String buildSerial = Build.UNKNOWN; - if (appInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) { + // TODO: SHTOPSHIP Uncomment the check when clients migrate +// if (appInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) { buildSerial = IDeviceIdentifiersPolicyService.Stub.asInterface( ServiceManager.getService(Context.DEVICE_IDENTIFIERS_SERVICE)) .getSerial(); - } +// } thread.bindApplication(processName, appInfo, providers, app.instrumentationClass, profilerInfo, app.instrumentationArguments, app.instrumentationWatcher,