PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-04 15:39:56 +00:00
committed by Android (Google) Code Review
parent 8f1309a69d c2e4513fb6
commit 6a68e2f216
23 changed files with 166 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/applications/appops/AppOpsState.java
View File

@@ -588,7 +588,7 @@ public class AppOpsState {
if (appEntry == null) {
continue;
}
List<AppOpsManager.OpEntry> dummyOps = null;
List<AppOpsManager.OpEntry> stubOps = null;
AppOpsManager.PackageOps pkgOps = null;
if (appInfo.requestedPermissions != null) {
for (int j=0; j<appInfo.requestedPermissions.length; j++) {
@@ -611,15 +611,15 @@ public class AppOpsState {
if (appEntry.hasOp(permOps.get(k))) {
continue;
}
if (dummyOps == null) {
dummyOps = new ArrayList<AppOpsManager.OpEntry>();
if (stubOps == null) {
stubOps = new ArrayList<AppOpsManager.OpEntry>();
pkgOps = new AppOpsManager.PackageOps(
appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
appInfo.packageName, appInfo.applicationInfo.uid, stubOps);
}
AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
permOps.get(k), AppOpsManager.MODE_ALLOWED, Collections.emptyMap());
dummyOps.add(opEntry);
stubOps.add(opEntry);
addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
packageName == null ? 0 : opToOrder[opEntry.getOp()]);
}