diff options
| author | Michael Groover <mpgroover@google.com> | 2020-03-27 16:43:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-27 16:43:43 +0000 |
| commit | 9a95976e1c56677483bf08cc04ff72597881a80c (patch) | |
| tree | 65d846f9bb4a981031af7f98705db4b7ca32f6c9 | |
| parent | 2a2aa927af5832fa33f51c7192df220c84820111 (diff) | |
| parent | 01be396381b01b1e4eaf5fe28b74756c1c6fefcf (diff) | |
Merge "Clean up device identifier access logging" into rvc-dev am: 01be396381
Change-Id: I7bc1ebbf13d1aa484923f311de189e3610443bd7
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 | ||||
| -rw-r--r-- | telephony/common/com/android/internal/telephony/TelephonyPermissions.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 3ddee29366c7..b0eb14852251 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -9184,8 +9184,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return true; } - Log.w(LOG_TAG, String.format("Package %s (uid=%d, pid=%d) cannot access Device IDs", - packageName, uid, pid)); return false; } diff --git a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java index 7e02966779a2..1a38a42873b7 100644 --- a/telephony/common/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/common/com/android/internal/telephony/TelephonyPermissions.java @@ -361,7 +361,8 @@ public final class TelephonyPermissions { TelephonyCommonStatsLog.write(TelephonyCommonStatsLog.DEVICE_IDENTIFIER_ACCESS_DENIED, callingPackage, message, /* isPreinstalled= */ false, false); } - Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message); + Log.w(LOG_TAG, "reportAccessDeniedToReadIdentifiers:" + callingPackage + ":" + message + ":" + + subId); // if the target SDK is pre-Q then check if the calling package would have previously // had access to device identifiers. if (callingPackageInfo != null && ( |