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

Commit 3e5c32df authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up unused methods from AppStateAppOpsBridge 

Bug: 258256121
Test: Manually with Settings
Change-Id: I88092cdf6135af784ec90bf0112526ae18557c94
parent ac06d8d5

src/com/android/settings/applications/AppStateAppOpsBridge.java

100755 → 100644
+0 −37
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.settingslib.applications.ApplicationsState; 
import com.android.settingslib.applications.ApplicationsState.AppEntry;



import java.util.Arrays;

import java.util.Collection;

import java.util.HashSet;

import java.util.List;

import java.util.Set;
@@ -247,7 +246,6 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge { 
        } catch (RemoteException e) {

            Log.w(TAG, "PackageManager is dead. Can't get list of packages granted "

                    + Arrays.toString(mPermissions), e);

            return;

        }

    }
@@ -299,41 +297,6 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge { 
        return packageName.equals("android") || packageName.equals(mContext.getPackageName());

    }



    public int getNumPackagesDeclaredPermission() {

        SparseArray<ArrayMap<String, PermissionState>> entries = getEntries();

        if (entries == null) {

            return 0;

        }

        final ArrayMap<String, PermissionState> entriesForProfile =

                entries.get(mUserManager.getProcessUserId());

        if (entriesForProfile == null) {

            return 0;

        }

        return entriesForProfile.size();

    }



    public int getNumPackagesAllowedByAppOps() {

        SparseArray<ArrayMap<String, PermissionState>> entries = getEntries();

        if (entries == null) {

            return 0;

        }

        loadPermissionsStates(entries);

        loadAppOpsStates(entries);

        final ArrayMap<String, PermissionState> entriesForProfile =

                entries.get(mUserManager.getProcessUserId());

        if (entriesForProfile == null) {

            return 0;

        }

        Collection<PermissionState> permStates = entriesForProfile.values();

        int result = 0;

        for (PermissionState permState : permStates) {

            if (permState.isPermissible()) {

                result++;

            }

        }

        return result;

    }



    public static class PermissionState {

        public final String packageName;

        public final UserHandle userHandle;

src/com/android/settings/applications/AppStateOverlayBridge.java

+0 −11
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import java.util.List; 
 */

public class AppStateOverlayBridge extends AppStateAppOpsBridge {



    private static final String TAG = "AppStateOverlayBridge";

    private static final int APP_OPS_OP_CODE = AppOpsManager.OP_SYSTEM_ALERT_WINDOW;

    private static final String PM_SYSTEM_ALERT_WINDOW = Manifest.permission.SYSTEM_ALERT_WINDOW;

    private static final String[] PM_PERMISSION = {
@@ -54,16 +53,6 @@ public class AppStateOverlayBridge extends AppStateAppOpsBridge { 
        return new OverlayState(permissionState);

    }



    // TODO: figure out how to filter out system apps for this method

    public int getNumberOfPackagesWithPermission() {

        return super.getNumPackagesDeclaredPermission();

    }



    // TODO: figure out how to filter out system apps for this method

    public int getNumberOfPackagesCanDrawOverlay() {

        return super.getNumPackagesAllowedByAppOps();

    }



    public static class OverlayState extends AppStateAppOpsBridge.PermissionState {

        public final boolean controlEnabled;

src/com/android/settings/applications/AppStateWriteSettingsBridge.java

+0 −12
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ import com.android.settingslib.applications.ApplicationsState.AppFilter; 
 * filters that can use the info.

 */

public class AppStateWriteSettingsBridge extends AppStateAppOpsBridge {



    private static final String TAG = "AppStateWriteSettingsBridge";

    private static final int APP_OPS_OP_CODE = AppOpsManager.OP_WRITE_SETTINGS;

    private static final String PM_WRITE_SETTINGS = Manifest.permission.WRITE_SETTINGS;
@@ -53,16 +51,6 @@ public class AppStateWriteSettingsBridge extends AppStateAppOpsBridge { 
        return new WriteSettingsState(permissionState);

    }



    // TODO: figure out how to filter out system apps for this method

    public int getNumberOfPackagesWithPermission() {

        return super.getNumPackagesDeclaredPermission();

    }



    // TODO: figure out how to filter out system apps for this method

    public int getNumberOfPackagesCanWriteSettings() {

        return super.getNumPackagesAllowedByAppOps();

    }



    public static class WriteSettingsState extends AppStateAppOpsBridge.PermissionState {

        public WriteSettingsState(PermissionState permissionState) {

            super(permissionState.packageName, permissionState.userHandle);