Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Temporary enable Build#SERIAL"

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-11-16 00:33:12 +00:00
committed by Android (Google) Code Review
parent bae5ca1490 b5e603f270
commit 63ff0d822b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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,