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

Commit a9b33ddf authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "DOs can clear the DI; rehide hasUserSetupCompleted."

parents 92c2ca95 e925440a

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5492,7 +5492,6 @@ package android.app.admin { 
    method public int getStorageEncryptionStatus();

    method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);

    method public boolean hasGrantedPolicy(android.content.ComponentName, int);

    method public boolean hasUserSetupCompleted();

    method public boolean installCaCert(android.content.ComponentName, byte[]);

    method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String);

    method public boolean isActivePasswordSufficient();

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -5593,7 +5593,6 @@ package android.app.admin { 
    method public int getStorageEncryptionStatus();

    method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);

    method public boolean hasGrantedPolicy(android.content.ComponentName, int);

    method public boolean hasUserSetupCompleted();

    method public boolean installCaCert(android.content.ComponentName, byte[]);

    method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate, java.lang.String);

    method public boolean isActivePasswordSufficient();
@@ -30906,8 +30905,8 @@ package android.telecom { 
    method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);

    field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";

    field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";

    field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";

    field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED";

    field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";

    field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";

    field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";

    field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','

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

+4 −4
Original line number Diff line number Diff line
@@ -2474,10 +2474,9 @@ public class DevicePolicyManager { 
    }



    /**

     * Clears the current device initializer.  The caller must be the device initializer.

     *

     * This function should be used cautiously as once it is called it cannot

     * be undone.

     * Removes the device initializer, so that it will not be invoked on user initialization for any

     * subsequently created users. This method can be called by either the device owner or device

     * initializer itself.

     */

    public void clearDeviceInitializerApp() {

        if (mService != null) {
@@ -2586,6 +2585,7 @@ public class DevicePolicyManager { 
    }



    /**

     * @hide

     * Checks if the user was already setup.

     */

    public boolean hasUserSetupCompleted() {

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

+3 −11
Original line number Diff line number Diff line
@@ -3947,18 +3947,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (packageName == null) {

            throw new NullPointerException("packageName is null");

        }

        try {

            int uid = mContext.getPackageManager().getPackageUid(packageName, 0);

            if (uid != Binder.getCallingUid()) {

                throw new SecurityException(

                        "clearDeviceInitializer can only be called by the device initializer");

            }

        } catch (NameNotFoundException e) {

            throw new SecurityException(e);

        }

        if (!isDeviceInitializer(packageName)) {



        if (!isDeviceInitializer(packageName) && !isDeviceOwner(packageName)) {

            throw new SecurityException(

                    "clearDeviceInitializer can only be called by the device initializer");

                    "clearDeviceInitializer can only be called by the device initializer/owner");

        }

        synchronized (this) {

            long ident = Binder.clearCallingIdentity();