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

DeviceIdentifierAccessDenied: deprecate is_preinstalled

Browse Source 
For statsd log DeviceIdentifierAccessDenied, field is_preinstalled is
provided by a hidden API. TelephonyPermissions cannot access hidden API
as a mainline module. So deprecate the field and always false.

Bug: 137202333
Test: make
Change-Id: Idb9b91015a867db9b9b0d2d8c1282e2afea65132
This commit is contained in:
Meng Wang
2020-01-29 10:38:58 -08:00
parent 489e391d8f
commit e8953ae762
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/statsd/src/atoms.proto
View File

@@ -6873,7 +6873,8 @@ message DeviceIdentifierAccessDenied {
optional string method_name = 2;
// True if the package is preinstalled.
optional bool is_preinstalled = 3;
// Starting from Android 11, this boolean is not set and will always be false.
optional bool is_preinstalled = 3 [deprecated = true];
// True if the package is privileged.
// Starting from Android 11, this boolean is not set and will always be false.

11
telephony/common/com/android/internal/telephony/TelephonyPermissions.java
View File

@@ -363,16 +363,10 @@ public final class TelephonyPermissions {
*/
private static boolean reportAccessDeniedToReadIdentifiers(Context context, int subId, int pid,
int uid, String callingPackage, String message) {
boolean isPreinstalled = false;
ApplicationInfo callingPackageInfo = null;
try {
callingPackageInfo = context.getPackageManager().getApplicationInfoAsUser(
callingPackage, 0, UserHandle.getUserHandleForUid(uid));
if (callingPackageInfo != null) {
if (callingPackageInfo.isSystemApp()) {
isPreinstalled = true;
}
}
} catch (PackageManager.NameNotFoundException e) {
// If the application info for the calling package could not be found then assume the
// calling app is a non-preinstalled app to detect any issues with the check
@@ -393,10 +387,9 @@ public final class TelephonyPermissions {
}
invokedMethods.add(message);
TelephonyCommonStatsLog.write(TelephonyCommonStatsLog.DEVICE_IDENTIFIER_ACCESS_DENIED,
callingPackage, message, isPreinstalled, false);
callingPackage, message, /* isPreinstalled= */ false, false);
}
Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message
+ ":isPreinstalled=" + isPreinstalled);
Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message);
// if the target SDK is pre-Q then check if the calling package would have previously
// had access to device identifiers.
if (callingPackageInfo != null && (