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

Commit b90444bd authored by Mohammad Islam's avatar Mohammad Islam Committed by Gerrit Code Review
Browse files

Merge changes Iad51cd85,I6414d28c 

* changes:
  Minor refactorings and cleanups.
  Simplifying callback calls in PackageInstallerSession.
parents 7ff5f631 fd1bb4d4

services/core/java/com/android/server/pm/PackageInstallerService.java

+45 −63
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.app.AppOpsManager; 
import android.app.Notification;

import android.app.NotificationManager;

import android.app.PackageDeleteObserver;

import android.app.PackageInstallObserver;

import android.app.admin.DevicePolicyEventLogger;

import android.app.admin.DevicePolicyManagerInternal;

import android.content.Context;
@@ -994,49 +993,33 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        }

    }



    static class PackageInstallObserverAdapter extends PackageInstallObserver {

        private final Context mContext;

        private final IntentSender mTarget;

        private final int mSessionId;

        private final boolean mShowNotification;

        private final int mUserId;



        public PackageInstallObserverAdapter(Context context, IntentSender target, int sessionId,

                boolean showNotification, int userId) {

            mContext = context;

            mTarget = target;

            mSessionId = sessionId;

            mShowNotification = showNotification;

            mUserId = userId;

        }



        @Override

        public void onUserActionRequired(Intent intent) {

    static void sendOnUserActionRequired(Context context, IntentSender target, int sessionId,

            Intent intent) {

        final Intent fillIn = new Intent();

            fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, mSessionId);

        fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);

        fillIn.putExtra(PackageInstaller.EXTRA_STATUS,

                PackageInstaller.STATUS_PENDING_USER_ACTION);

        fillIn.putExtra(Intent.EXTRA_INTENT, intent);

        try {

                mTarget.sendIntent(mContext, 0, fillIn, null, null);

            target.sendIntent(context, 0, fillIn, null, null);

        } catch (SendIntentException ignored) {

        }

    }



        @Override

        public void onPackageInstalled(String basePackageName, int returnCode, String msg,

                Bundle extras) {

            if (PackageManager.INSTALL_SUCCEEDED == returnCode && mShowNotification) {

    static void sendOnPackageInstalled(Context context, IntentSender target, int sessionId,

            boolean showNotification, int userId, String basePackageName, int returnCode,

            String msg, Bundle extras) {

        if (PackageManager.INSTALL_SUCCEEDED == returnCode && showNotification) {

            boolean update = (extras != null) && extras.getBoolean(Intent.EXTRA_REPLACING);

                Notification notification = buildSuccessNotification(mContext,

                        mContext.getResources()

            Notification notification = buildSuccessNotification(context,

                    context.getResources()

                            .getString(update ? R.string.package_updated_device_owner :

                                    R.string.package_installed_device_owner),

                    basePackageName,

                        mUserId);

                    userId);

            if (notification != null) {

                NotificationManager notificationManager = (NotificationManager)

                            mContext.getSystemService(Context.NOTIFICATION_SERVICE);

                        context.getSystemService(Context.NOTIFICATION_SERVICE);

                notificationManager.notify(basePackageName,

                        SystemMessage.NOTE_PACKAGE_STATE,

                        notification);
@@ -1044,7 +1027,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        }

        final Intent fillIn = new Intent();

        fillIn.putExtra(PackageInstaller.EXTRA_PACKAGE_NAME, basePackageName);

            fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, mSessionId);

        fillIn.putExtra(PackageInstaller.EXTRA_SESSION_ID, sessionId);

        fillIn.putExtra(PackageInstaller.EXTRA_STATUS,

                PackageManager.installStatusToPublicStatus(returnCode));

        fillIn.putExtra(PackageInstaller.EXTRA_STATUS_MESSAGE,
@@ -1058,11 +1041,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
            }

        }

        try {

                mTarget.sendIntent(mContext, 0, fillIn, null, null);

            target.sendIntent(context, 0, fillIn, null, null);

        } catch (SendIntentException ignored) {

        }

    }

    }



    /**

     * Build a notification for package installation / deletion by device owners that is shown if

services/core/java/com/android/server/pm/PackageInstallerSession.java

+109 −144

File changed.

Preview size limit exceeded, changes collapsed.