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

Commit 15e636b5 authored by Gustav Sennton's avatar Gustav Sennton Committed by Android (Google) Code Review
Browse files

Merge "Ensure we don't crash the system server when disabling/enabling package." into nyc-dev

parents 4e9348c7 ff396f27

services/core/java/com/android/server/webkit/SystemImpl.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.webkit; 
import android.app.ActivityManagerNative;

import android.app.ActivityManagerNative;

import android.app.AppGlobals;

import android.app.AppGlobals;

import android.content.Context;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.IPackageDeleteObserver;

import android.content.pm.IPackageDeleteObserver;

import android.content.pm.PackageInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;
@@ -187,7 +188,8 @@ public class SystemImpl implements SystemInterface { 
        enablePackageForAllUsers(context, packageName, false);

        enablePackageForAllUsers(context, packageName, false);

        try {

        try {

            PackageManager pm = AppGlobals.getInitialApplication().getPackageManager();

            PackageManager pm = AppGlobals.getInitialApplication().getPackageManager();

            if (pm.getApplicationInfo(packageName, 0).isUpdatedSystemApp()) {

            ApplicationInfo applicationInfo = pm.getApplicationInfo(packageName, 0);

            if (applicationInfo != null && applicationInfo.isUpdatedSystemApp()) {

                pm.deletePackage(packageName, new IPackageDeleteObserver.Stub() {

                pm.deletePackage(packageName, new IPackageDeleteObserver.Stub() {

                        public void packageDeleted(String packageName, int returnCode) {

                        public void packageDeleted(String packageName, int returnCode) {

                            enablePackageForAllUsers(context, packageName, false);

                            enablePackageForAllUsers(context, packageName, false);
@@ -214,8 +216,9 @@ public class SystemImpl implements SystemInterface { 
                    enable ? PackageManager.COMPONENT_ENABLED_STATE_DEFAULT :

                    enable ? PackageManager.COMPONENT_ENABLED_STATE_DEFAULT :

                    PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0,

                    PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0,

                    userId, null);

                    userId, null);

        } catch (RemoteException e) {

        } catch (RemoteException | IllegalArgumentException e) {

            Log.w(TAG, "Tried to disable " + packageName + " for user " + userId + ": " + e);

            Log.w(TAG, "Tried to " + (enable ? "enable " : "disable ") + packageName

                    + " for user " + userId + ": " + e);

        }

        }

    }

    }

services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -160,6 +160,8 @@ public class WebViewUpdateServiceImpl { 
            isFallbackEnabled = isEnabledPackage(

            isFallbackEnabled = isEnabledPackage(

                    mSystemInterface.getPackageInfoForProvider(fallbackProvider));

                    mSystemInterface.getPackageInfoForProvider(fallbackProvider));

        } catch (NameNotFoundException e) {

        } catch (NameNotFoundException e) {

            // No fallback package installed -> early out.

            return;

        }

        }





        if (existsValidNonFallbackProvider

        if (existsValidNonFallbackProvider