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

Commit 334a4e4d authored by Felipe Leme's avatar Felipe Leme Committed by Automerger Merge Worker
Browse files

Merge "Rename resetNewUserDisclaimer() to acknowledgeNewUserDisclaimer()" into... 

Merge "Rename resetNewUserDisclaimer() to acknowledgeNewUserDisclaimer()" into sc-v2-dev am: d7a45338

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

Change-Id: I1bcbc2c6b4de0471a6a5fd17e00a3210392bf7bf
parents a14c588d d7a45338

core/java/android/app/admin/DevicePolicyManager.java

+11 −4
Original line number Diff line number Diff line
@@ -3103,11 +3103,18 @@ public class DevicePolicyManager { 
        }

    }













    /** @hide */













    public void resetNewUserDisclaimer() {













    /**













     * Acknoledges that the new managed user disclaimer was viewed by the (human) user













     * so that {@link #ACTION_SHOW_NEW_USER_DISCLAIMER broadcast} is not sent again the next time













     * this user is switched to.













     *













     * @hide













     */













    @RequiresPermission(android.Manifest.permission.MANAGE_USERS)













    public void acknowledgeNewUserDisclaimer() {















        if (mService != null) {















            try {













                mService.resetNewUserDisclaimer();













                mService.acknowledgeNewUserDisclaimer();















            } catch (RemoteException e) {















                throw e.rethrowFromSystemServer();















            }










@@ -5673,7 +5680,7 @@ public class DevicePolicyManager {













     */















    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)















    public static final String ACTION_SHOW_NEW_USER_DISCLAIMER =













            "android.app.action.ACTION_SHOW_NEW_USER_DISCLAIMER";













            "android.app.action.SHOW_NEW_USER_DISCLAIMER";





























    /**















     * Widgets are enabled in keyguard

































core/java/android/app/admin/IDevicePolicyManager.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -265,7 +265,7 @@ interface IDevicePolicyManager {













    int getLogoutUserId();















    void clearLogoutUser();















    List<UserHandle> getSecondaryUsers(in ComponentName who);













    void resetNewUserDisclaimer();













    void acknowledgeNewUserDisclaimer();































    void enableSystemApp(in ComponentName admin, in String callerPackage, in String packageName);















    int enableSystemAppWithIntent(in ComponentName admin, in String callerPackage, in Intent intent);

































core/res/AndroidManifest.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -711,7 +711,7 @@













    <protected-broadcast android:name="android.scheduling.action.REBOOT_READY" />















    <protected-broadcast android:name="android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED" />















    <protected-broadcast android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />













    <protected-broadcast android:name="android.app.action.ACTION_SHOW_NEW_USER_DISCLAIMER" />













    <protected-broadcast android:name="android.app.action.SHOW_NEW_USER_DISCLAIMER" />































    <!-- ====================================================================== -->















    <!--                          RUNTIME PERMISSIONS                           -->

































services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -10768,7 +10768,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    }





























    @Override













    public void resetNewUserDisclaimer() {













    public void acknowledgeNewUserDisclaimer() {















        CallerIdentity callerIdentity = getCallerIdentity();















        canManageUsers(callerIdentity);