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

Commit f6791990 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Dismiss PackageInstallerActivity when SimpleErrorDialog cancelled" into... 

Merge "Dismiss PackageInstallerActivity when SimpleErrorDialog cancelled" into sc-dev am: 949d11e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14442471

Change-Id: If7f12100cc81821b89437db57f4c399a5b6bac58
parents cf1c9ad3 949d11e6

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTE 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.StringRes;

import android.app.Activity;

import android.app.AlertDialog;

import android.app.AppGlobals;

import android.app.AppOpsManager;
@@ -632,6 +633,12 @@ public class PackageInstallerActivity extends AlertActivity { 
                    .setPositiveButton(R.string.ok, (dialog, which) -> getActivity().finish())

                    .create();

        }



        @Override

        public void onCancel(DialogInterface dialog) {

            getActivity().setResult(Activity.RESULT_CANCELED);

            getActivity().finish();

        }

    }



    /**