commit 5a44511f145d3819cc5efdf403e620a62c367493
author Jeff Sharkey <jsharkey@android.com> Fri Jan 08 18:32:04 2016 -0700
committer Jeff Sharkey <jsharkey@android.com> Fri Jan 08 18:36:13 2016 -0700
tree d0342a4d088589009e992d732055c47174e01d52
parent e4669d1ef354568560d526573c0b8cbc0d108262

Follow AIDL refactoring.

Bug: 26471205
Change-Id: I20aa94fb599eda9ee4b1d0b8de208aecb9e560e7

android/app/src/com/android/bluetooth/Utils.java

diff --git a/android/app/src/com/android/bluetooth/Utils.java b/android/app/src/com/android/bluetooth/Utils.java
index b7392bd..e78341a 100644
--- a/android/app/src/com/android/bluetooth/Utils.java
+++ b/android/app/src/com/android/bluetooth/Utils.java
@@ -211,8 +211,9 @@
             ok = (foregroundUser == callingUser);
             if (!ok) {
                 // Always allow SystemUI/System access.
-                int systemUiUid = ActivityThread.getPackageManager().getPackageUid(
-                        "com.android.systemui", UserHandle.USER_SYSTEM);
+                final int systemUiUid = ActivityThread.getPackageManager().getPackageUid(
+                        "com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY,
+                        UserHandle.USER_SYSTEM);
                 ok = (systemUiUid == callingUid) || (Process.SYSTEM_UID == callingUid);
             }
         } catch (Exception ex) {
@@ -245,8 +246,9 @@
                     (foregroundUser == parentUser);
             if (!ok) {
                 // Always allow SystemUI/System access.
-                int systemUiUid = ActivityThread.getPackageManager().getPackageUid(
-                        "com.android.systemui", UserHandle.USER_SYSTEM);
+                final int systemUiUid = ActivityThread.getPackageManager().getPackageUid(
+                        "com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY,
+                        UserHandle.USER_SYSTEM);
                 ok = (systemUiUid == callingUid) || (Process.SYSTEM_UID == callingUid);
             }
         } catch (Exception ex) {