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

Merge "Fix component management in VrManagerService." into nyc-mr1-dev

Browse Source
This commit is contained in:
Ruben Brunk
2016-08-02 23:01:24 +00:00
committed by Android (Google) Code Review
parent 7841042a83 1f4f26b1d5
commit 964d6914ff
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/vr/VrManagerService.java
View File

@@ -46,6 +46,7 @@ import android.service.vr.IVrListener;
import android.service.vr.IVrManager; import android.service.vr.IVrManager;
import android.service.vr.IVrStateCallbacks; import android.service.vr.IVrStateCallbacks;
import android.service.vr.VrListenerService; import android.service.vr.VrListenerService;
import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Slog; import android.util.Slog;
@@ -643,7 +644,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC
for (String c : current) { for (String c : current) {
ComponentName component = ComponentName.unflattenFromString(c); ComponentName component = ComponentName.unflattenFromString(c);
if (component.getPackageName().equals(pkg)) { if (component != null && component.getPackageName().equals(pkg)) {
toRemove.add(c); toRemove.add(c);
} }
} }
@@ -671,7 +672,9 @@ public class VrManagerService extends SystemService implements EnabledComponentC
if (flat != null) { if (flat != null) {
String[] allowed = flat.split(":"); String[] allowed = flat.split(":");
for (String s : allowed) { for (String s : allowed) {
current.add(s); if (!TextUtils.isEmpty(s)) {
current.add(s);
}
} }
} }
return current; return current;