Revert "Restore preferred activity filter if it not inside"

This reverts commit da90fd9871ee128a127e32280475279360c61f66.

Reason for revert:

1-18 13:33:52.927  2356  2356 E System  : ******************************************
11-18 13:33:52.927  2356  2356 E System  : ************ Failure starting system services
11-18 13:33:52.927  2356  2356 E System  : java.lang.ArrayIndexOutOfBoundsException: length=2; index=2
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.pm.PreferredComponent.sameSet(PreferredComponent.java:266)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.pm.PreferredIntentResolver.shouldAddPreferredActivity(PreferredIntentResolver.java:63)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.pm.Settings.readPreferredActivitiesLPw(Settings.java:1315)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.pm.Settings.readPackageRestrictionsLPr(Settings.java:1686)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.pm.Settings.readLPw(Settings.java:3032)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.pm.PackageManagerService.<init>(PackageManagerService.java:3185)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.pm.PackageManagerService.main(PackageManagerService.java:2781)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:970)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.SystemServer.run(SystemServer.java:704)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.server.SystemServer.main(SystemServer.java:444)
11-18 13:33:52.927  2356  2356 E System  : 	at java.lang.reflect.Method.invoke(Native Method)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
11-18 13:33:52.927  2356  2356 E System  : 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:946)
11-18 13:33:52.927  2356  2356 D SystemServerTiming: StartPackageManagerService took to complete: 158ms
11-18 13:33:52.927  2356  2356 E Zygote  : System zygote died with fatal exception
11-18 13:33:52.927  2356  2356 E Zygote  : java.lang.ArrayIndexOutOfBoundsException: length=2; index=2
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.pm.PreferredComponent.sameSet(PreferredComponent.java:266)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.pm.PreferredIntentResolver.shouldAddPreferredActivity(PreferredIntentResolver.java:63)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.pm.Settings.readPreferredActivitiesLPw(Settings.java:1315)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.pm.Settings.readPackageRestrictionsLPr(Settings.java:1686)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.pm.Settings.readLPw(Settings.java:3032)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.pm.PackageManagerService.<init>(PackageManagerService.java:3185)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.pm.PackageManagerService.main(PackageManagerService.java:2781)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:970)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.SystemServer.run(SystemServer.java:704)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.server.SystemServer.main(SystemServer.java:444)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at java.lang.reflect.Method.invoke(Native Method)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
11-18 13:33:52.927  2356  2356 E Zygote  : 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:946)
11-18 13:33:52.927  2356  2356 D AndroidRuntime: Shutting down VM
11-18 13:33:52.927  2356  2356 E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: main
11-18 13:33:52.927  2356  2356 E AndroidRuntime: java.lang.ArrayIndexOutOfBoundsException: length=2; index=2
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.pm.PreferredComponent.sameSet(PreferredComponent.java:266)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.pm.PreferredIntentResolver.shouldAddPreferredActivity(PreferredIntentResolver.java:63)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.pm.Settings.readPreferredActivitiesLPw(Settings.java:1315)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.pm.Settings.readPackageRestrictionsLPr(Settings.java:1686)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.pm.Settings.readLPw(Settings.java:3032)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.pm.PackageManagerService.<init>(PackageManagerService.java:3185)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.pm.PackageManagerService.main(PackageManagerService.java:2781)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:970)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.SystemServer.run(SystemServer.java:704)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.server.SystemServer.main(SystemServer.java:444)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at java.lang.reflect.Method.invoke(Native Method)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
11-18 13:33:52.927  2356  2356 E AndroidRuntime: 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:946)
11-18 13:33:52.928  2356  2356 E AndroidRuntime: Error reporting crash
11-18 13:33:52.928  2356  2356 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke interface method 'void android.app.IActivityManager.handleApplicationCrash(android.os.IBinder, android.app.ApplicationErrorReport$ParcelableCrashInfo)' on a null object reference
11-18 13:33:52.928  2356  2356 E AndroidRuntime: 	at com.android.internal.os.RuntimeInit$KillApplicationHandler.uncaughtException(RuntimeInit.java:156)
11-18 13:33:52.928  2356  2356 E AndroidRuntime: 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:1073)
11-18 13:33:52.928  2356  2356 E AndroidRuntime: 	at java.lang.ThreadGroup.uncaughtException(ThreadGroup.java:1068)
11-18 13:33:52.928  2356  2356 E AndroidRuntime: 	at java.lang.Thread.dispatchUncaughtException(Thread.java:2191)

Change-Id: I9c018f52c16dc6cf1a160db58e08fbeb42803af6
3 files changed