commit 41868ab7731a26f66724b3c237dbc8775a25840a
author android-build-team Robot <android-build-team-robot@google.com> Fri Oct 11 02:37:35 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 11 02:37:35 2019 +0000
tree c4efc0ea3734b498ac623a33dc777eba0dadeac4
parent e6d784bbb5429d86553262856a49da94c8933a67
parent a685d45c7818c406a02fbaed33ed397518019641

Merge cherrypicks of [9537713, 9537701, 9537702, 9537538, 9537180, 9537181, 9537182, 9537183, 9537764, 9537703, 9537784, 9537785, 9537714, 9537715, 9537716, 9537717, 9537786, 9537718, 9537719, 9537720, 9537721, 9537722, 9537787, 9537788, 9537723, 9537804, 9537805, 9537789] into qt-qpr1-release

Change-Id: I1ae4e8b3018c90a5573c89fa449afe2ad714224a

src/com/android/providers/media/LocalCallingIdentity.java

diff --git a/src/com/android/providers/media/LocalCallingIdentity.java b/src/com/android/providers/media/LocalCallingIdentity.java
index 583f7a5..2292ff0 100644
--- a/src/com/android/providers/media/LocalCallingIdentity.java
+++ b/src/com/android/providers/media/LocalCallingIdentity.java
@@ -227,7 +227,7 @@
 
     private boolean isRedactionNeededInternal() {
         // System internals or callers holding permission have no redaction
-        if (hasPermission(PERMISSION_IS_SYSTEM) || PermissionChecker.checkPermission(getContext(),
+        if (hasPermission(PERMISSION_IS_SYSTEM) || PermissionChecker.checkPermissionForDataDelivery(getContext(),
                 ACCESS_MEDIA_LOCATION, pid, uid, getPackageName())
                 == PermissionChecker.PERMISSION_GRANTED) {
             return false;