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

Commit 7e351fda authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Stop querying package names unnecessarily 

This is just a code clean-up.  No behavior change is intended.

BUG: 18131340
Change-Id: Ia88374cde7845553530ddd1176f983101e4ec13f
parent ea2e042f

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+11 −22
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ import android.content.pm.IPackageManager; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.hardware.usb.UsbManager;

import android.hardware.usb.UsbManager;
@@ -4275,8 +4276,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                try {

                try {

                    ApplicationInfo applicationInfo = pm.getApplicationInfo(enabledPackage,

                    ApplicationInfo applicationInfo = pm.getApplicationInfo(enabledPackage,

                            PackageManager.GET_UNINSTALLED_PACKAGES, userIdToCheck);

                            PackageManager.GET_UNINSTALLED_PACKAGES, userIdToCheck);

                    systemService = (applicationInfo.flags

                    systemService = (applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;

                            & ApplicationInfo.FLAG_SYSTEM) != 0;

                } catch (RemoteException e) {

                } catch (RemoteException e) {

                    Log.i(LOG_TAG, "Can't talk to package managed", e);

                    Log.i(LOG_TAG, "Can't talk to package managed", e);

                }

                }
@@ -4410,15 +4410,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    IPackageManager pm = AppGlobals.getPackageManager();

                    IPackageManager pm = AppGlobals.getPackageManager();

                    if (installedServices != null) {

                    if (installedServices != null) {

                        for (AccessibilityServiceInfo service : installedServices) {

                        for (AccessibilityServiceInfo service : installedServices) {

                            String packageName = service.getResolveInfo().serviceInfo.packageName;

                            ServiceInfo serviceInfo = service.getResolveInfo().serviceInfo;

                            try {

                            ApplicationInfo applicationInfo = serviceInfo.applicationInfo;

                                ApplicationInfo applicationInfo = pm.getApplicationInfo(packageName,

                                        PackageManager.GET_UNINSTALLED_PACKAGES, userId);

                            if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {

                            if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {

                                    result.add(packageName);

                                result.add(serviceInfo.packageName);

                                }

                            } catch (RemoteException e) {

                                Log.i(LOG_TAG, "Accessibility service in missing package", e);

                            }

                            }

                        }

                        }

                    }

                    }
@@ -4569,16 +4564,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    IPackageManager pm = AppGlobals.getPackageManager();

                    IPackageManager pm = AppGlobals.getPackageManager();

                    if (imes != null) {

                    if (imes != null) {

                        for (InputMethodInfo ime : imes) {

                        for (InputMethodInfo ime : imes) {

                            String packageName = ime.getPackageName();

                            ServiceInfo serviceInfo = ime.getServiceInfo();

                            try {

                            ApplicationInfo applicationInfo = serviceInfo.applicationInfo;

                                ApplicationInfo applicationInfo = pm.getApplicationInfo(

                                        packageName, PackageManager.GET_UNINSTALLED_PACKAGES,

                                        userId);

                            if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {

                            if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {

                                    result.add(packageName);

                                result.add(serviceInfo.packageName);

                                }

                            } catch (RemoteException e) {

                                Log.i(LOG_TAG, "Input method for missing package", e);

                            }

                            }

                        }

                        }

                    }

                    }
@@ -4945,7 +4934,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            throws RemoteException {

            throws RemoteException {

        ApplicationInfo appInfo = pm.getApplicationInfo(packageName, GET_UNINSTALLED_PACKAGES,

        ApplicationInfo appInfo = pm.getApplicationInfo(packageName, GET_UNINSTALLED_PACKAGES,

                userId);

                userId);

        return (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) > 0;

        return (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;

    }

    }





    @Override

    @Override