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

Merge "Fix NPE in updateActivityRecognizerTags()."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-17 08:42:05 +00:00
committed by Android (Google) Code Review
parent d50231ade7 5c22e835fc
commit c1f007a713
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import android.content.pm.ResolveInfo;
import android.location.LocationManagerInternal;
import android.net.Uri;
import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
import android.os.PackageTagsList;
import android.os.Process;
@@ -342,8 +343,11 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat
+ Intent.ACTION_ACTIVITY_RECOGNIZER + ", ignoring!");
return;
}
final String tagsList = resolvedService.serviceInfo.metaData.getString(
ACTIVITY_RECOGNITION_TAGS);
final Bundle metaData = resolvedService.serviceInfo.metaData;
if (metaData == null) {
return;
}
final String tagsList = metaData.getString(ACTIVITY_RECOGNITION_TAGS);
if (!TextUtils.isEmpty(tagsList)) {
PackageTagsList packageTagsList = new PackageTagsList.Builder(1).add(
resolvedService.serviceInfo.packageName,