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

Merge "Notify all packages is uid-mode is changed" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-02 01:29:56 +00:00
committed by Android (Google) Code Review
parent 2d62d5b7ec 7f0136aac9
commit f240cfab55
1 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -31,6 +31,7 @@ import static android.app.AppOpsManager.UID_STATE_FOREGROUND_SERVICE_LOCATION;
import static android.app.AppOpsManager.UID_STATE_MAX_LAST_NON_RESTRICTED; import static android.app.AppOpsManager.UID_STATE_MAX_LAST_NON_RESTRICTED;
import static android.app.AppOpsManager.UID_STATE_PERSISTENT; import static android.app.AppOpsManager.UID_STATE_PERSISTENT;
import static android.app.AppOpsManager.UID_STATE_TOP; import static android.app.AppOpsManager.UID_STATE_TOP;
import static android.app.AppOpsManager.WATCH_FOREGROUND_CHANGES;
import static android.app.AppOpsManager.modeToName; import static android.app.AppOpsManager.modeToName;
import static android.app.AppOpsManager.opToName; import static android.app.AppOpsManager.opToName;
import static android.app.AppOpsManager.resolveFirstUnrestrictedUidState; import static android.app.AppOpsManager.resolveFirstUnrestrictedUidState;
@@ -1285,6 +1286,18 @@ public class AppOpsService extends IAppOpsService.Stub {
uidState.evalForegroundOps(mOpModeWatchers); uidState.evalForegroundOps(mOpModeWatchers);
} }
notifyOpChangedForAllPkgsInUid(code, uid, false);
notifyOpChangedSync(code, uid, null, mode);
}
/**
* Notify that an op changed for all packages in an uid.
*
* @param code The op that changed
* @param uid The uid the op was changed for
* @param onlyForeground Only notify watchers that watch for foreground changes
*/
private void notifyOpChangedForAllPkgsInUid(int code, int uid, boolean onlyForeground) {
String[] uidPackageNames = getPackagesForUid(uid); String[] uidPackageNames = getPackagesForUid(uid);
ArrayMap<ModeCallback, ArraySet<String>> callbackSpecs = null; ArrayMap<ModeCallback, ArraySet<String>> callbackSpecs = null;
@@ -1294,6 +1307,10 @@ public class AppOpsService extends IAppOpsService.Stub {
final int callbackCount = callbacks.size(); final int callbackCount = callbacks.size();
for (int i = 0; i < callbackCount; i++) { for (int i = 0; i < callbackCount; i++) {
ModeCallback callback = callbacks.valueAt(i); ModeCallback callback = callbacks.valueAt(i);
if (onlyForeground && (callback.mFlags & WATCH_FOREGROUND_CHANGES) == 0) {
continue;
}
ArraySet<String> changedPackages = new ArraySet<>(); ArraySet<String> changedPackages = new ArraySet<>();
Collections.addAll(changedPackages, uidPackageNames); Collections.addAll(changedPackages, uidPackageNames);
if (callbackSpecs == null) { if (callbackSpecs == null) {
@@ -1312,6 +1329,10 @@ public class AppOpsService extends IAppOpsService.Stub {
final int callbackCount = callbacks.size(); final int callbackCount = callbacks.size();
for (int i = 0; i < callbackCount; i++) { for (int i = 0; i < callbackCount; i++) {
ModeCallback callback = callbacks.valueAt(i); ModeCallback callback = callbacks.valueAt(i);
if (onlyForeground && (callback.mFlags & WATCH_FOREGROUND_CHANGES) == 0) {
continue;
}
ArraySet<String> changedPackages = callbackSpecs.get(callback); ArraySet<String> changedPackages = callbackSpecs.get(callback);
if (changedPackages == null) { if (changedPackages == null) {
changedPackages = new ArraySet<>(); changedPackages = new ArraySet<>();
@@ -1324,7 +1345,6 @@ public class AppOpsService extends IAppOpsService.Stub {
} }
if (callbackSpecs == null) { if (callbackSpecs == null) {
notifyOpChangedSync(code, uid, null, mode);
return; return;
} }
@@ -1346,8 +1366,6 @@ public class AppOpsService extends IAppOpsService.Stub {
} }
} }
} }
notifyOpChangedSync(code, uid, null, mode);
} }
private void notifyOpChangedSync(int code, int uid, @NonNull String packageName, int mode) { private void notifyOpChangedSync(int code, int uid, @NonNull String packageName, int mode) {
@@ -2471,24 +2489,28 @@ public class AppOpsService extends IAppOpsService.Stub {
if (resolvedLastFg == resolvedNowFg) { if (resolvedLastFg == resolvedNowFg) {
continue; continue;
} }
final ArraySet<ModeCallback> callbacks = mOpModeWatchers.get(code);
if (callbacks != null) { if (uidState.opModes != null
for (int cbi = callbacks.size() - 1; cbi >= 0; cbi--) { && uidState.opModes.indexOfKey(code) >= 0
final ModeCallback callback = callbacks.valueAt(cbi); && uidState.opModes.get(code) == AppOpsManager.MODE_FOREGROUND) {
if ((callback.mFlags & AppOpsManager.WATCH_FOREGROUND_CHANGES) == 0 mHandler.sendMessage(PooledLambda.obtainMessage(
|| !callback.isWatchingUid(uidState.uid)) { AppOpsService::notifyOpChangedForAllPkgsInUid,
continue; this, code, uidState.uid, true));
} } else {
boolean doAllPackages = uidState.opModes != null final ArraySet<ModeCallback> callbacks = mOpModeWatchers.get(code);
&& uidState.opModes.indexOfKey(code) >= 0 if (callbacks != null) {
&& uidState.opModes.get(code) == AppOpsManager.MODE_FOREGROUND; for (int cbi = callbacks.size() - 1; cbi >= 0; cbi--) {
if (uidState.pkgOps != null) { final ModeCallback callback = callbacks.valueAt(cbi);
if ((callback.mFlags & AppOpsManager.WATCH_FOREGROUND_CHANGES) == 0
|| !callback.isWatchingUid(uidState.uid)) {
continue;
}
for (int pkgi = uidState.pkgOps.size() - 1; pkgi >= 0; pkgi--) { for (int pkgi = uidState.pkgOps.size() - 1; pkgi >= 0; pkgi--) {
final Op op = uidState.pkgOps.valueAt(pkgi).get(code); final Op op = uidState.pkgOps.valueAt(pkgi).get(code);
if (op == null) { if (op == null) {
continue; continue;
} }
if (doAllPackages || op.mode == AppOpsManager.MODE_FOREGROUND) { if (op.mode == AppOpsManager.MODE_FOREGROUND) {
mHandler.sendMessage(PooledLambda.obtainMessage( mHandler.sendMessage(PooledLambda.obtainMessage(
AppOpsService::notifyOpChanged, AppOpsService::notifyOpChanged,
this, callback, code, uidState.uid, this, callback, code, uidState.uid,