mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-29 16:12:38 +00:00
30 lines
1.6 KiB
Diff
30 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Wed, 6 Sep 2017 21:40:48 -0400
|
|
Subject: [PATCH] always set deprecated Build.SERIAL to UNKNOWN
|
|
|
|
Only support fetching the serial number via the new Build.getSerial()
|
|
requiring the READ_PHONE_STATE permission.
|
|
---
|
|
.../java/com/android/server/am/ActivityManagerService.java | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
|
|
index 234b23a99626..6f52225a9c5a 100644
|
|
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
|
|
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
|
|
@@ -5284,12 +5284,7 @@ public class ActivityManagerService extends IActivityManager.Stub
|
|
}
|
|
}
|
|
|
|
- // We deprecated Build.SERIAL and it is not accessible to
|
|
- // Instant Apps and target APIs higher than O MR1. Since access to the serial
|
|
- // is now behind a permission we push down the value.
|
|
- final String buildSerial = (!appInfo.isInstantApp()
|
|
- && appInfo.targetSdkVersion < Build.VERSION_CODES.P)
|
|
- ? sTheRealBuildSerial : Build.UNKNOWN;
|
|
+ final String buildSerial = Build.UNKNOWN;
|
|
|
|
// Check if this is a secondary process that should be incorporated into some
|
|
// currently active instrumentation. (Note we do this AFTER all of the profiling
|