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

Commit 4f564346 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "New API for getting enabledcomponent" am: bca93eaf 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818892

Change-Id: I46736aedc7df2d8e6926414adb9b48748386393d
parents 76aa9344 bca93eaf

core/api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -8549,6 +8549,7 @@ package android.os { 
  public class SystemConfigManager {

  public class SystemConfigManager {

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Set<java.lang.String> getDisabledUntilUsedPreinstalledCarrierApps();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Set<java.lang.String> getDisabledUntilUsedPreinstalledCarrierApps();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Map<java.lang.String,java.util.List<java.lang.String>> getDisabledUntilUsedPreinstalledCarrierAssociatedApps();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_CARRIER_APP_INFO) public java.util.Map<java.lang.String,java.util.List<java.lang.String>> getDisabledUntilUsedPreinstalledCarrierAssociatedApps();

    method @NonNull public java.util.List<java.lang.String> getEnabledComponentOverrides(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public int[] getSystemPermissionUids(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public int[] getSystemPermissionUids(@NonNull String);

  }

  }































core/java/android/os/ISystemConfig.aidl



+5
−0




























Original line number
Original line
Diff line number
Diff line








@@ -40,4 +40,9 @@ interface ISystemConfig {









     * @see SystemConfigManager#getSystemPermissionUids







     * @see SystemConfigManager#getSystemPermissionUids











     */







     */











    int[] getSystemPermissionUids(String permissionName);







    int[] getSystemPermissionUids(String permissionName);





























    /**














     * @see SystemConfigManager#getEnabledComponentOverrides














     */














    List<String> getEnabledComponentOverrides(String packageName);











}






}
























core/java/android/os/SystemConfigManager.java



+18
−0




























Original line number
Original line
Diff line number
Diff line








@@ -17,6 +17,7 @@ package android.os;





























import android.Manifest;







import android.Manifest;











import android.annotation.NonNull;







import android.annotation.NonNull;














import android.annotation.Nullable;











import android.annotation.RequiresPermission;







import android.annotation.RequiresPermission;











import android.annotation.SystemApi;







import android.annotation.SystemApi;











import android.annotation.SystemService;







import android.annotation.SystemService;










@@ -129,4 +130,21 @@ public class SystemConfigManager {









            throw e.rethrowFromSystemServer();







            throw e.rethrowFromSystemServer();











        }







        }











    }







    }





























    /**














     * Get enabled component for a specific package














     *














     * @param packageName The target package.














     * @return The enabled component














     * {@hide}














     */














    @SystemApi














    @NonNull














    public List<String> getEnabledComponentOverrides(@NonNull String packageName) {














        try {














            return mInterface.getEnabledComponentOverrides(packageName);














        } catch (RemoteException e) {














            throw e.rethrowFromSystemServer();














        }














    }











}






}
























services/java/com/android/server/SystemConfigService.java



+16
−0




























Original line number
Original line
Diff line number
Diff line








@@ -21,6 +21,7 @@ import static java.util.stream.Collectors.toMap;









import android.Manifest;







import android.Manifest;











import android.content.Context;







import android.content.Context;











import android.os.ISystemConfig;







import android.os.ISystemConfig;














import android.util.ArrayMap;











import android.util.ArraySet;







import android.util.ArraySet;











import android.util.SparseArray;







import android.util.SparseArray;






























@@ -84,6 +85,21 @@ public class SystemConfigService extends SystemService {









            }







            }











            return ArrayUtils.convertToIntArray(uids);







            return ArrayUtils.convertToIntArray(uids);











        }







        }





























        @Override














        public List<String> getEnabledComponentOverrides(String packageName) {














            ArrayMap<String, Boolean> systemComponents = SystemConfig.getInstance()














                    .getComponentsEnabledStates(packageName);














            List<String> enabledComponent = new ArrayList<>();














            if (systemComponents != null) {














                for (Map.Entry<String, Boolean> entry : systemComponents.entrySet()) {














                    if (Boolean.TRUE.equals(entry.getValue())) {














                        enabledComponent.add(entry.getKey());














                    }














                }














            }














            return enabledComponent;














        }











    };







    };































    public SystemConfigService(Context context) {







    public SystemConfigService(Context context) {