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

Commit 195b02b5 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12 QPR 3"

parents 5a1f9e67 6811cf79

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -4534,13 +4534,15 @@ public class AlarmManagerService extends SystemService { 
            filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);

            filter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);

            filter.addDataScheme(IntentFilter.SCHEME_PACKAGE);

            getContext().registerReceiver(this, filter);

            getContext().registerReceiverForAllUsers(this, filter,

                    /* broadcastPermission */ null, /* scheduler */ null);

            // Register for events related to sdcard installation.

            IntentFilter sdFilter = new IntentFilter();

            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);

            sdFilter.addAction(Intent.ACTION_USER_STOPPED);

            sdFilter.addAction(Intent.ACTION_UID_REMOVED);

            getContext().registerReceiver(this, sdFilter);

            getContext().registerReceiverForAllUsers(this, sdFilter,

                    /* broadcastPermission */ null, /* scheduler */ null);

        }



        @Override

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ package android.app.admin { 
    method @NonNull @RequiresPermission("android.permission.MANAGE_DEVICE_ADMINS") public java.util.Set<java.lang.String> getPolicyExemptApps();

    method public boolean isCurrentInputMethodSetByOwner();

    method public boolean isFactoryResetProtectionPolicySupported();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isNewUserDisclaimerAcknowledged();

    method @RequiresPermission(anyOf={"android.permission.MARK_DEVICE_ORGANIZATION_OWNED", "android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"}, conditional=true) public void markProfileOwnerOnOrganizationOwnedDevice(@NonNull android.content.ComponentName);

    method @NonNull public static String operationSafetyReasonToString(int);

    method @NonNull public static String operationToString(int);

core/java/android/app/Activity.java

+4 −1
Original line number Diff line number Diff line
@@ -1537,7 +1537,10 @@ public class Activity extends ContextThemeWrapper 
    }



    private void dispatchActivityConfigurationChanged() {

        // In case the new config comes before mApplication is assigned.

        if (getApplication() != null) {

            getApplication().dispatchActivityConfigurationChanged(this);

        }

        Object[] callbacks = collectActivityLifecycleCallbacks();

        if (callbacks != null) {

            for (int i = 0; i < callbacks.length; i++) {

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ interface IActivityManager { 


    void requestInteractiveBugReport();

    void requestFullBugReport();

    void requestRemoteBugReport();

    void requestRemoteBugReport(long nonce);

    boolean launchBugReportHandlerApp();

    List<String> getBugreportWhitelistedPackages();

core/java/android/app/IActivityTaskManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ interface IActivityTaskManager { 
     * a short predefined amount of time.

     */

    void registerRemoteAnimationForNextActivityStart(in String packageName,

           in RemoteAnimationAdapter adapter);

            in RemoteAnimationAdapter adapter, in IBinder launchCookie);



    /**

     * Registers remote animations for a display.