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

Merge "Remove invalid source tags in AppOpsPolicy" into sc-dev

Browse Source
This commit is contained in:
Nate Myren
2021-06-04 22:49:43 +00:00
committed by Android (Google) Code Review
parent 6d3b5033d7 c38dc5456c
commit 57b72445ad
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/policy/AppOpsPolicy.java
View File

@@ -43,8 +43,6 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.function.DecFunction; import com.android.internal.util.function.DecFunction;
import com.android.internal.util.function.HeptFunction; import com.android.internal.util.function.HeptFunction;
import com.android.internal.util.function.HexFunction; import com.android.internal.util.function.HexFunction;
import com.android.internal.util.function.NonaFunction;
import com.android.internal.util.function.OctFunction;
import com.android.internal.util.function.QuadFunction; import com.android.internal.util.function.QuadFunction;
import com.android.internal.util.function.QuintFunction; import com.android.internal.util.function.QuintFunction;
import com.android.internal.util.function.TriFunction; import com.android.internal.util.function.TriFunction;
@@ -321,6 +319,17 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat
if (appIdTags == null) { if (appIdTags == null) {
appIdTags = new ArrayMap<>(); appIdTags = new ArrayMap<>();
} }
// Remove any invalid tags
boolean nullRemoved = packageTags.remove(null);
boolean nullStrRemoved = packageTags.remove("null");
boolean emptyRemoved = packageTags.remove("");
if (nullRemoved || nullStrRemoved || emptyRemoved) {
Log.e(LOG_TAG, "Attempted to add invalid source attribution tag, removed "
+ "null: " + nullRemoved + " removed \"null\": " + nullStrRemoved
+ " removed empty string: " + emptyRemoved);
}
appIdTags.put(packageName, packageTags); appIdTags.put(packageName, packageTags);
datastore.put(appId, appIdTags); datastore.put(appId, appIdTags);
} else if (appIdTags != null) { } else if (appIdTags != null) {