OSDN Git Service

Follow AIDL refactoring.
authorJeff Sharkey <jsharkey@android.com>
Sat, 9 Jan 2016 01:32:04 +0000 (18:32 -0700)
committerJeff Sharkey <jsharkey@android.com>
Sat, 9 Jan 2016 01:36:13 +0000 (18:36 -0700)
Bug: 26471205
Change-Id: I20aa94fb599eda9ee4b1d0b8de208aecb9e560e7

src/com/android/bluetooth/Utils.java

index b7392bd..e78341a 100644 (file)
@@ -211,8 +211,9 @@ final public class Utils {
             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 @@ final public class Utils {
                     (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) {