Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 711ff332: am 91941a57: am 19fd8658: am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev

Browse Source 
* commit '711ff3323fd6641bbf83bbdad5c4032db98d8572':
  Remove personal/device group from sideloading screen.
This commit is contained in:
Julia Reynolds
2015-07-14 16:28:43 +00:00
committed by Android Git Automerger
parent c3b7c3a996 711ff3323f
commit e8ff4f718d
2 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/java/android/widget/AppSecurityPermissions.java
View File

@@ -61,8 +61,6 @@ import java.util.Set;
*/ */
public class AppSecurityPermissions { public class AppSecurityPermissions {
public static final int WHICH_PERSONAL = 1<<0;
public static final int WHICH_DEVICE = 1<<1;
public static final int WHICH_NEW = 1<<2; public static final int WHICH_NEW = 1<<2;
public static final int WHICH_ALL = 0xffff; public static final int WHICH_ALL = 0xffff;
@@ -75,7 +73,8 @@ public class AppSecurityPermissions {
= new HashMap<String, MyPermissionGroupInfo>(); = new HashMap<String, MyPermissionGroupInfo>();
private final List<MyPermissionGroupInfo> mPermGroupsList private final List<MyPermissionGroupInfo> mPermGroupsList
= new ArrayList<MyPermissionGroupInfo>(); = new ArrayList<MyPermissionGroupInfo>();
private final PermissionGroupInfoComparator mPermGroupComparator = new PermissionGroupInfoComparator(); private final PermissionGroupInfoComparator mPermGroupComparator =
new PermissionGroupInfoComparator();
private final PermissionInfoComparator mPermComparator = new PermissionInfoComparator(); private final PermissionInfoComparator mPermComparator = new PermissionInfoComparator();
private final List<MyPermissionInfo> mPermsList = new ArrayList<MyPermissionInfo>(); private final List<MyPermissionInfo> mPermsList = new ArrayList<MyPermissionInfo>();
private final CharSequence mNewPermPrefix; private final CharSequence mNewPermPrefix;
@@ -85,8 +84,6 @@ public class AppSecurityPermissions {
CharSequence mLabel; CharSequence mLabel;
final ArrayList<MyPermissionInfo> mNewPermissions = new ArrayList<MyPermissionInfo>(); final ArrayList<MyPermissionInfo> mNewPermissions = new ArrayList<MyPermissionInfo>();
final ArrayList<MyPermissionInfo> mPersonalPermissions = new ArrayList<MyPermissionInfo>();
final ArrayList<MyPermissionInfo> mDevicePermissions = new ArrayList<MyPermissionInfo>();
final ArrayList<MyPermissionInfo> mAllPermissions = new ArrayList<MyPermissionInfo>(); final ArrayList<MyPermissionInfo> mAllPermissions = new ArrayList<MyPermissionInfo>();
MyPermissionGroupInfo(PermissionInfo perm) { MyPermissionGroupInfo(PermissionInfo perm) {
@@ -352,13 +349,6 @@ public class AppSecurityPermissions {
} }
for (int i=0; i<strList.length; i++) { for (int i=0; i<strList.length; i++) {
String permName = strList[i]; String permName = strList[i];
// If we are only looking at an existing app, then we only
// care about permissions that have actually been granted to it.
if (installedPkgInfo != null && info != installedPkgInfo) {
if ((flagsList[i]&PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
continue;
}
}
try { try {
PermissionInfo tmpPermInfo = mPm.getPermissionInfo(permName, 0); PermissionInfo tmpPermInfo = mPm.getPermissionInfo(permName, 0);
if (tmpPermInfo == null) { if (tmpPermInfo == null) {
@@ -431,10 +421,6 @@ public class AppSecurityPermissions {
private List<MyPermissionInfo> getPermissionList(MyPermissionGroupInfo grp, int which) { private List<MyPermissionInfo> getPermissionList(MyPermissionGroupInfo grp, int which) {
if (which == WHICH_NEW) { if (which == WHICH_NEW) {
return grp.mNewPermissions; return grp.mNewPermissions;
} else if (which == WHICH_PERSONAL) {
return grp.mPersonalPermissions;
} else if (which == WHICH_DEVICE) {
return grp.mDevicePermissions;
} else { } else {
return grp.mAllPermissions; return grp.mAllPermissions;
} }
@@ -577,15 +563,8 @@ public class AppSecurityPermissions {
private static class PermissionGroupInfoComparator implements Comparator<MyPermissionGroupInfo> { private static class PermissionGroupInfoComparator implements Comparator<MyPermissionGroupInfo> {
private final Collator sCollator = Collator.getInstance(); private final Collator sCollator = Collator.getInstance();
PermissionGroupInfoComparator() { @Override
}
public final int compare(MyPermissionGroupInfo a, MyPermissionGroupInfo b) { public final int compare(MyPermissionGroupInfo a, MyPermissionGroupInfo b) {
if (((a.flags^b.flags)&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) {
return ((a.flags&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) ? -1 : 1;
}
if (a.priority != b.priority) {
return a.priority > b.priority ? -1 : 1;
}
return sCollator.compare(a.mLabel, b.mLabel); return sCollator.compare(a.mLabel, b.mLabel);
} }
} }
@@ -628,11 +607,6 @@ public class AppSecurityPermissions {
if (pInfo.mNew) { if (pInfo.mNew) {
addPermToList(group.mNewPermissions, pInfo); addPermToList(group.mNewPermissions, pInfo);
} }
if ((group.flags&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) {
addPermToList(group.mPersonalPermissions, pInfo);
} else {
addPermToList(group.mDevicePermissions, pInfo);
}
} }
} }
} }
@@ -652,12 +626,5 @@ public class AppSecurityPermissions {
mPermGroupsList.add(pgrp); mPermGroupsList.add(pgrp);
} }
Collections.sort(mPermGroupsList, mPermGroupComparator); Collections.sort(mPermGroupsList, mPermGroupComparator);
if (localLOGV) {
for (MyPermissionGroupInfo grp : mPermGroupsList) {
Log.i(TAG, "Group " + grp.name + " personal="
+ ((grp.flags&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0)
+ " priority=" + grp.priority);
}
}
} }
} }

3
core/res/res/layout/app_permission_item.xml
View File

@@ -31,7 +31,8 @@
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:scaleType="fitCenter" /> android:scaleType="fitCenter"
android:tint="@android:color/black"/>
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"