summaryrefslogtreecommitdiff
path: root/telephony/common
diff options
context:
space:
mode:
authorMeng Wang <mewan@google.com>2020-01-29 10:38:58 -0800
committerMeng Wang <mewan@google.com>2020-01-29 10:38:58 -0800
commite8953ae762dcc3c5b75ca37c0d050f7382b37946 (patch)
tree7b32a46deb8f516ffea84c231a1f12243c762f82 /telephony/common
parent489e391d8f97359a20c42fe276dfb076c67775c9 (diff)
DeviceIdentifierAccessDenied: deprecate is_preinstalled
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
Diffstat (limited to 'telephony/common')
-rw-r--r--telephony/common/com/android/internal/telephony/TelephonyPermissions.java11
1 files changed, 2 insertions, 9 deletions
diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java
index 7b3aace798f7..b89772538c6d 100644
--- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java
+++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java
@@ -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 && (