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

Commit 6a07868b authored by Sumedh Sen's avatar Sumedh Sen Committed by Android Build Coastguard Worker
Browse files

Prevent showing overlays when unarchiving 

When unarchiving an app:
- Hide non-system overlays
- Disable the restore button when another window is being shown on top
  of Pia

Bug: 370958259
Test: atest CtsPackageUninstallTestCases:ArchiveTest
Flag: EXEMPT.Bug fix only
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1612955cb7fb2f69f1e04d437bb7fabd411ff7c)
Merged-In: If750c0a613136f3ad3040c544bd70ab428fe5ef2
Change-Id: If750c0a613136f3ad3040c544bd70ab428fe5ef2
parent 0947ef7f

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

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.packageinstaller; 
import static android.Manifest.permission;

import static android.content.pm.PackageManager.GET_PERMISSIONS;

import static android.content.pm.PackageManager.MATCH_ARCHIVED_PACKAGES;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.app.Activity;

import android.app.DialogFragment;
@@ -53,6 +54,8 @@ public class UnarchiveActivity extends Activity { 


    @Override

    public void onCreate(Bundle icicle) {

        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        super.onCreate(null);



        int callingUid = getLaunchedFromUid();

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

+30 −1
Original line number Diff line number Diff line
@@ -21,10 +21,14 @@ import android.app.Dialog; 
import android.app.DialogFragment;

import android.content.DialogInterface;

import android.os.Bundle;

import android.widget.Button;



public class UnarchiveFragment extends DialogFragment implements

        DialogInterface.OnClickListener {



    private Dialog mDialog;

    private Button mRestoreButton;



    @Override

    public Dialog onCreateDialog(Bundle savedInstanceState) {

        String appTitle = getArguments().getString(UnarchiveActivity.APP_TITLE);
@@ -40,7 +44,32 @@ public class UnarchiveFragment extends DialogFragment implements 
        dialogBuilder.setPositiveButton(R.string.restore, this);

        dialogBuilder.setNegativeButton(android.R.string.cancel, this);



        return dialogBuilder.create();

        mDialog = dialogBuilder.create();

        return mDialog;

    }



    @Override

    public void onStart() {

        super.onStart();

        if (mDialog != null) {

            mRestoreButton = ((AlertDialog) mDialog).getButton(DialogInterface.BUTTON_POSITIVE);

        }

    }



    @Override

    public void onPause() {

        super.onPause();

        if (mRestoreButton != null) {

            mRestoreButton.setEnabled(false);

        }

    }



    @Override

    public void onResume() {

        super.onResume();

        if (mRestoreButton != null) {

            mRestoreButton.setEnabled(true);

        }

    }



    @Override