Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c657da43 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Mend up onDestroy->onCreate for N. 

am: 1dba1776

* commit '1dba1776':
  Mend up onDestroy->onCreate for N.

Change-Id: I00752f0fbbba45886c0a081bb137dccbec145c03
parents ccdc9446 1dba1776

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
        </activity>



        <activity android:name=".UninstallAppProgress"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:configChanges="mnc|mnc|touchscreen|navigation|screenLayout|screenSize|smallestScreenSize|orientation|locale|keyboard|keyboardHidden|fontScale|uiMode|layoutDirection|density"

                android:exported="false" />



        <activity android:name=".permission.ui.GrantPermissionsActivity"

src/com/android/packageinstaller/UninstallAppProgress.java

+28 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.pm.IPackageManager; 
import android.content.pm.PackageInstaller;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.graphics.Color;

import android.graphics.drawable.ColorDrawable;

import android.os.Bundle;
@@ -92,6 +93,10 @@ public class UninstallAppProgress extends Activity implements OnClickListener { 


    private Handler mHandler = new Handler() {

        public void handleMessage(Message msg) {

            if (isFinishing() || isDestroyed()) {

                return;

            }



            switch (msg.what) {

                case UNINSTALL_IS_SLOW:

                    initView();
@@ -237,8 +242,31 @@ public class UninstallAppProgress extends Activity implements OnClickListener { 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);



        Intent intent = getIntent();

        mAppInfo = intent.getParcelableExtra(PackageUtil.INTENT_ATTR_APPLICATION_INFO);

        mCallback = intent.getIBinderExtra(PackageInstaller.EXTRA_CALLBACK);



        // This currently does not support going through a onDestroy->onCreate cycle. Hence if that

        // happened, just fail the operation for mysterious reasons.

        if (icicle != null) {

            mResultCode = PackageManager.DELETE_FAILED_INTERNAL_ERROR;



            if (mCallback != null) {

                final IPackageDeleteObserver2 observer = IPackageDeleteObserver2.Stub

                        .asInterface(mCallback);

                try {

                    observer.onPackageDeleted(mAppInfo.packageName, mResultCode, null);

                } catch (RemoteException ignored) {

                }

                finish();

            } else {

                setResultAndFinish(mResultCode);

            }



            return;

        }



        mAllUsers = intent.getBooleanExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, false);

        if (mAllUsers && !UserManager.get(this).isAdminUser()) {

            throw new SecurityException("Only admin user can request uninstall for all users");
@@ -254,7 +282,6 @@ public class UninstallAppProgress extends Activity implements OnClickListener { 
                        + "request uninstall for user " + mUser);

            }

        }

        mCallback = intent.getIBinderExtra(PackageInstaller.EXTRA_CALLBACK);



        PackageDeleteObserver observer = new PackageDeleteObserver();