Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev

2012-09-24 11:24:26 -07:00
parent 7451f15e74 03bdc8a8f7
commit 9b93f4def1
1 changed files with 1 additions and 2 deletions
--- a/services/java/com/android/server/AppWidgetServiceImpl.java
+++ b/services/java/com/android/server/AppWidgetServiceImpl.java
@@ -1398,8 +1398,7 @@ class AppWidgetServiceImpl {

    int enforceSystemOrCallingUid(String packageName) throws IllegalArgumentException {
        int callingUid = Binder.getCallingUid();
-        int uid = Process.myUid();
-        if (UserHandle.getAppId(uid) == Process.SYSTEM_UID || uid == 0) {
+        if (UserHandle.getAppId(callingUid) == Process.SYSTEM_UID || callingUid == 0) {
            return callingUid;
        }
        return enforceCallingUid(packageName);