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

Commit 1890941b authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge changes from topic "impl-ecm-controller" into main 

* changes:
  [ECM] Register EnhancedConfirmationManager
  [ECM] Make ACCESS_RESTRICTED_SETTINGS SystemApi
  [ECM] Make flag fixed (and rename it)
parents 4ed8f1e4 17e333aa

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ package android.app { 
    field public static final String OPSTR_ACCEPT_HANDOVER = "android:accept_handover";

    field public static final String OPSTR_ACCESS_ACCESSIBILITY = "android:access_accessibility";

    field public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";

    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String OPSTR_ACCESS_RESTRICTED_SETTINGS = "android:access_restricted_settings";

    field public static final String OPSTR_ACTIVATE_PLATFORM_VPN = "android:activate_platform_vpn";

    field public static final String OPSTR_ACTIVATE_VPN = "android:activate_vpn";

    field public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot";
@@ -3541,6 +3542,7 @@ package android.content { 
    field public static final String CLOUDSEARCH_SERVICE = "cloudsearch";

    field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String ECM_ENHANCED_CONFIRMATION_SERVICE = "ecm_enhanced_confirmation";

    field public static final String ETHERNET_SERVICE = "ethernet";

    field public static final String EUICC_CARD_SERVICE = "euicc_card";

    field public static final String FONT_SERVICE = "font";

core/java/android/app/AppOpsManager.java

+2 −0
Original line number Diff line number Diff line
@@ -2180,6 +2180,8 @@ public class AppOpsManager { 
     *

     * @hide

     */

    @FlaggedApi(android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED)

    @SystemApi

    public static final String OPSTR_ACCESS_RESTRICTED_SETTINGS =

            "android:access_restricted_settings";

core/java/android/app/SystemServiceRegistry.java

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.app.appsearch.AppSearchManagerFrameworkInitializer; 
import android.app.blob.BlobStoreManagerFrameworkInitializer;

import android.app.contentsuggestions.ContentSuggestionsManager;

import android.app.contentsuggestions.IContentSuggestionsManager;

import android.app.ecm.EnhancedConfirmationFrameworkInitializer;

import android.app.job.JobSchedulerFrameworkInitializer;

import android.app.people.PeopleManager;

import android.app.prediction.AppPredictionManager;
@@ -1631,6 +1632,9 @@ public final class SystemServiceRegistry { 
            OnDevicePersonalizationFrameworkInitializer.registerServiceWrappers();

            DeviceLockFrameworkInitializer.registerServiceWrappers();

            VirtualizationFrameworkInitializer.registerServiceWrappers();

            if (android.permission.flags.Flags.enhancedConfirmationModeApisEnabled()) {

                EnhancedConfirmationFrameworkInitializer.registerServiceWrappers();

            }

        } finally {

            // If any of the above code throws, we're in a pretty bad shape and the process

            // will likely crash, but we'll reset it just in case there's an exception handler...

core/java/android/content/Context.java

+13 −0
Original line number Diff line number Diff line
@@ -4242,6 +4242,7 @@ public abstract class Context { 
            VIRTUALIZATION_SERVICE,

            GRAMMATICAL_INFLECTION_SERVICE,

            SECURITY_STATE_SERVICE,

           //@hide: ECM_ENHANCED_CONFIRMATION_SERVICE,



    })

    @Retention(RetentionPolicy.SOURCE)
@@ -6526,6 +6527,18 @@ public abstract class Context { 
    @FlaggedApi(Flags.FLAG_SECURITY_STATE_SERVICE)

    public static final String SECURITY_STATE_SERVICE = "security_state";



    /**

     * Use with {@link #getSystemService(String)} to retrieve an

     * {@link android.app.ecm.EnhancedConfirmationManager}.

     *

     * @see #getSystemService(String)

     * @see android.app.ecm.EnhancedConfirmationManager

     * @hide

     */

    @FlaggedApi(android.permission.flags.Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED)

    @SystemApi

    public static final String ECM_ENHANCED_CONFIRMATION_SERVICE = "ecm_enhanced_confirmation";



    /**

     * Determine whether the given permission is allowed for a particular

     * process and user ID running in the system.

core/java/android/permission/flags.aconfig

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ flag { 
}



flag {

    name: "enhanced_confirmation_mode_apis"

    name: "enhanced_confirmation_mode_apis_enabled"

    is_fixed_read_only: true

    namespace: "permissions"

    description: "enable enhanced confirmation mode apis"

    bug: "310220212"