Merge "Fix UsbResolverActivity SuperNotCalledException (pt2)" (09091369) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverActivity.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,15 @@ public class ResolverActivity extends Activity implements
		return intent;
		}

		/**
		* Call {@link Activity#onCreate} without initializing anything further. This should
		* only be used when the activity is about to be immediately finished to avoid wasting
		* initializing steps and leaking resources.
		*/
		protected void super_onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		}

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		// Use a specialized prompt when we're handling the 'Home' app startActivity()

+2 −4

Original line number	Diff line number	Diff line
		@@ -63,8 +63,7 @@ public class UsbResolverActivity extends ResolverActivity {
		Intent intent = getIntent();
		Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT);
		if (!(targetParcelable instanceof Intent)) {
		super.onCreate(savedInstanceState);
		onStop(); // unregister receiver registered in onCreate (PackageMonitor)
		super_onCreate(savedInstanceState);
		Log.w("UsbResolverActivity", "Target is not an intent: " + targetParcelable);
		finish();
		return;
		@@ -97,8 +96,7 @@ public class UsbResolverActivity extends ResolverActivity {
		} else {
		mAccessory = (UsbAccessory)target.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
		if (mAccessory == null) {
		super.onCreate(savedInstanceState);
		onStop(); // unregister receiver registered in onCreate (PackageMonitor)
		super_onCreate(savedInstanceState);
		Log.e(TAG, "no device or accessory");
		finish();
		return;