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

Commit db1de85e authored by Sumedh Sen's avatar Sumedh Sen Committed by Android Build Cherrypicker Worker
Browse files

Re-land "Show failure dialog when app can't be installed due to secureFRP" 

This reverts commit f4405139.

Reason for revert: the original change ag/25249419 was reverted on git-main due to b/312830483, b/312816948. This code change is necessary in main branch, along with other upstream branches to fix the above-mentioned bugs.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dc145607402efe5078dac977a1b1c020b71a1e9c)
Merged-In: I5a2c8349b6755e3f31b05d327dc68f4461a42963
Change-Id: I5a2c8349b6755e3f31b05d327dc68f4461a42963
parent 23e53c1c

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -290,7 +290,14 @@ public class InstallInstalling extends AlertActivity { 
                        broadcastIntent,

                        broadcastIntent,

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);

                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);





                try {

                    session.commit(pendingIntent.getIntentSender());

                    session.commit(pendingIntent.getIntentSender());

                } catch (Exception e) {

                    Log.e(LOG_TAG, "Cannot install package: ", e);

                    launchFailure(PackageInstaller.STATUS_FAILURE,

                        PackageManager.INSTALL_FAILED_INTERNAL_ERROR, null);

                    return;

                }

                mCancelButton.setEnabled(false);

                mCancelButton.setEnabled(false);

                setFinishOnTouchOutside(false);

                setFinishOnTouchOutside(false);

            } else {

            } else {