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

Commit da9211b7 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Adding platform permissions to audio, media, and camera" into udc-dev... 

Merge "Adding platform permissions to audio, media, and camera" into udc-dev am: 79895fcf am: 76089ae7

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



Change-Id: Ic5b0e2c6ef75dbe6f638893ef9761fd71112aa07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8d0ab40 76089ae7

core/java/android/app/IActivityManager.aidl

+9 −10
Original line number Diff line number Diff line
@@ -108,6 +108,15 @@ interface IActivityManager { 
    int getUidProcessState(int uid, in String callingPackage);

    @UnsupportedAppUsage

    int checkPermission(in String permission, int pid, int uid);



    /** Logs start of an API call to associate with an FGS, used for FGS Type Metrics */

    void logFgsApiBegin(int apiType, int appUid, int appPid);



    /** Logs stop of an API call to associate with an FGS, used for FGS Type Metrics */

    void logFgsApiEnd(int apiType, int appUid, int appPid);



    /** Logs API state change to associate with an FGS, used for FGS Type Metrics */

    void logFgsApiStateChanged(int apiType, int state, int appUid, int appPid);

    // =============== End of transactions used on native side as well ============================



    // Special low-level communication with activity manager.
@@ -870,16 +879,6 @@ interface IActivityManager { 
    /** Returns if the service is a short-service is still "alive" and past the timeout. */

    boolean shouldServiceTimeOut(in ComponentName className, in IBinder token);



    /** Logs start of an API call to associate with an FGS, used for FGS Type Metrics */

    void logFgsApiBegin(int apiType, int appUid, int appPid);



    /** Logs stop of an API call to associate with an FGS, used for FGS Type Metrics */

    void logFgsApiEnd(int apiType, int appUid, int appPid);



    /** Logs API state change to associate with an FGS, used for FGS Type Metrics */

    void logFgsApiStateChanged(int apiType, int state, int appUid, int appPid);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)")

    void registerUidFrozenStateChangedCallback(in IUidFrozenStateChangedCallback callback);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)")

    void unregisterUidFrozenStateChangedCallback(in IUidFrozenStateChangedCallback callback);

data/etc/platform.xml

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
    <assign-permission name="android.permission.REGISTER_MEDIA_RESOURCE_OBSERVER" uid="media" />

    <assign-permission name="android.permission.REGISTER_STATS_PULL_ATOM" uid="media" />

    <assign-permission name="android.permission.INTERACT_ACROSS_USERS" uid="media" />

    <assign-permission name="android.permission.LOG_FOREGROUND_RESOURCE_USE" uid="media" />



    <assign-permission name="android.permission.INTERNET" uid="media" />
@@ -173,6 +174,7 @@ 
    <assign-permission name="android.permission.PACKAGE_USAGE_STATS" uid="audioserver" />

    <assign-permission name="android.permission.INTERACT_ACROSS_USERS_FULL" uid="audioserver" />

    <assign-permission name="android.permission.OBSERVE_SENSOR_PRIVACY" uid="audioserver" />

    <assign-permission name="android.permission.LOG_FOREGROUND_RESOURCE_USE" uid="audioserver" />



    <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="cameraserver" />

    <assign-permission name="android.permission.INTERACT_ACROSS_USERS_FULL" uid="cameraserver" />
@@ -186,6 +188,7 @@ 
    <assign-permission name="android.permission.MANAGE_APP_OPS_MODES" uid="cameraserver" />

    <assign-permission name="android.permission.OBSERVE_SENSOR_PRIVACY" uid="cameraserver" />

    <assign-permission name="android.permission.REAL_GET_TASKS" uid="cameraserver" />

    <assign-permission name="android.permission.LOG_FOREGROUND_RESOURCE_USE" uid="cameraserver" />



    <assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />