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

Commit 699d537d authored by Mahaver Chopra's avatar Mahaver Chopra Committed by Android (Google) Code Review
Browse files

Merge "Adding DPM.reboot"

parents 12a47ac4 1ce53bc5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5790,6 +5790,7 @@ package android.app.admin { 
    method public boolean isProvisioningAllowed(java.lang.String);

    method public boolean isUninstallBlocked(android.content.ComponentName, java.lang.String);

    method public void lockNow();

    method public void reboot(android.content.ComponentName);

    method public void removeActiveAdmin(android.content.ComponentName);

    method public boolean removeCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);

    method public boolean removeKeyPair(android.content.ComponentName, java.lang.String);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5923,6 +5923,7 @@ package android.app.admin { 
    method public boolean isUninstallBlocked(android.content.ComponentName, java.lang.String);

    method public void lockNow();

    method public void notifyPendingSystemUpdate(long);

    method public void reboot(android.content.ComponentName);

    method public void removeActiveAdmin(android.content.ComponentName);

    method public boolean removeCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);

    method public boolean removeKeyPair(android.content.ComponentName, java.lang.String);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5790,6 +5790,7 @@ package android.app.admin { 
    method public boolean isProvisioningAllowed(java.lang.String);

    method public boolean isUninstallBlocked(android.content.ComponentName, java.lang.String);

    method public void lockNow();

    method public void reboot(android.content.ComponentName);

    method public void removeActiveAdmin(android.content.ComponentName);

    method public boolean removeCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);

    method public boolean removeKeyPair(android.content.ComponentName, java.lang.String);

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

+14 −3
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.ContactsContract.Directory;

import android.provider.Settings;

import android.security.Credentials;

import android.service.restrictions.RestrictionsReceiver;

import android.util.Log;
@@ -56,14 +56,14 @@ import java.io.IOException; 
import java.net.InetSocketAddress;

import java.net.Proxy;

import java.security.KeyFactory;

import java.security.NoSuchAlgorithmException;

import java.security.PrivateKey;

import java.security.cert.Certificate;

import java.security.cert.CertificateException;

import java.security.cert.CertificateFactory;

import java.security.cert.X509Certificate;

import java.security.spec.PKCS8EncodedKeySpec;

import java.security.spec.InvalidKeySpecException;

import java.security.NoSuchAlgorithmException;

import java.security.spec.PKCS8EncodedKeySpec;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;
@@ -4721,4 +4721,15 @@ public class DevicePolicyManager { 
            return null;

        }

    }



    /**

     * Called by device owner to reboot the device.

     */

    public void reboot(@NonNull ComponentName admin) {

        try {

            mService.reboot(admin);

        } catch (RemoteException re) {

            Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, re);

        }

    }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -241,4 +241,5 @@ interface IDevicePolicyManager { 
    boolean isManagedProfile(in ComponentName admin);

    boolean isSystemOnlyUser(in ComponentName admin);

    String getWifiMacAddress();

    void reboot(in ComponentName admin);

}