Fix security check for private allocateAppWidgetId api

mikejurka · mikejurka · commit 03bdc8a8f756 · 2012-09-21T16:10:21.000-07:00
Bug: 7182054
diff --git a/services/java/com/android/server/AppWidgetServiceImpl.java b/services/java/com/android/server/AppWidgetServiceImpl.java
@@ -1394,8 +1394,7 @@ int getUidForPackage(String packageName) throws PackageManager.NameNotFoundExcep
 
     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);

Original file line number	Diff line number	Diff line change
`@@ -1394,8 +1394,7 @@ int getUidForPackage(String packageName) throws PackageManager.NameNotFoundExcep`
`1394`	`1394`
`1395`	`1395`	`int enforceSystemOrCallingUid(String packageName) throws IllegalArgumentException {`
`1396`	`1396`	`int callingUid = Binder.getCallingUid();`
`1397`		`- int uid = Process.myUid();`
`1398`		`- if (UserHandle.getAppId(uid) == Process.SYSTEM_UID \|\| uid == 0) {`
	`1397`	`+ if (UserHandle.getAppId(callingUid) == Process.SYSTEM_UID \|\| callingUid == 0) {`
`1399`	`1398`	`return callingUid;`
`1400`	`1399`	`}`
`1401`	`1400`	`return enforceCallingUid(packageName);`