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

Commit bc0ce990 authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge "Logging of keyguard actions into security log"

parents 15569c46 31502d3d

api/current.txt

+3 −2
Original line number Diff line number Diff line
@@ -6516,8 +6516,9 @@ package android.auditing { 
    field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452

    field public static final int TAG_ADB_SHELL_INTERACTIVE = 210001; // 0x33451

    field public static final int TAG_APP_PROCESS_START = 210005; // 0x33455

    field public static final int TAG_DEVICE_LOCKED = 210007; // 0x33457

    field public static final int TAG_DEVICE_UNLOCK_ATTEMPT = 210006; // 0x33456

    field public static final int TAG_KEYGUARD_DISMISSED = 210006; // 0x33456

    field public static final int TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT = 210007; // 0x33457

    field public static final int TAG_KEYGUARD_SECURED = 210008; // 0x33458

    field public static final int TAG_SYNC_RECV_FILE = 210003; // 0x33453

    field public static final int TAG_SYNC_SEND_FILE = 210004; // 0x33454

  }

api/system-current.txt

+3 −2
Original line number Diff line number Diff line
@@ -6774,8 +6774,9 @@ package android.auditing { 
    field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452

    field public static final int TAG_ADB_SHELL_INTERACTIVE = 210001; // 0x33451

    field public static final int TAG_APP_PROCESS_START = 210005; // 0x33455

    field public static final int TAG_DEVICE_LOCKED = 210007; // 0x33457

    field public static final int TAG_DEVICE_UNLOCK_ATTEMPT = 210006; // 0x33456

    field public static final int TAG_KEYGUARD_DISMISSED = 210006; // 0x33456

    field public static final int TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT = 210007; // 0x33457

    field public static final int TAG_KEYGUARD_SECURED = 210008; // 0x33458

    field public static final int TAG_SYNC_RECV_FILE = 210003; // 0x33453

    field public static final int TAG_SYNC_SEND_FILE = 210004; // 0x33454

  }

api/test-current.txt

+3 −2
Original line number Diff line number Diff line
@@ -6518,8 +6518,9 @@ package android.auditing { 
    field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452

    field public static final int TAG_ADB_SHELL_INTERACTIVE = 210001; // 0x33451

    field public static final int TAG_APP_PROCESS_START = 210005; // 0x33455

    field public static final int TAG_DEVICE_LOCKED = 210007; // 0x33457

    field public static final int TAG_DEVICE_UNLOCK_ATTEMPT = 210006; // 0x33456

    field public static final int TAG_KEYGUARD_DISMISSED = 210006; // 0x33456

    field public static final int TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT = 210007; // 0x33457

    field public static final int TAG_KEYGUARD_SECURED = 210008; // 0x33458

    field public static final int TAG_SYNC_RECV_FILE = 210003; // 0x33453

    field public static final int TAG_SYNC_SEND_FILE = 210004; // 0x33454

  }

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

+28 −0
Original line number Diff line number Diff line
@@ -2972,6 +2972,34 @@ public class DevicePolicyManager { 
        }

    }



    /**

     * Should be called when keyguard has been dismissed.

     * @hide

     */

    public void reportKeyguardDismissed() {

        if (mService != null) {

            try {

                mService.reportKeyguardDismissed();

            } catch (RemoteException e) {

                Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, e);

            }

        }

    }



    /**

     * Should be called when keyguard view has been shown to the user.

     * @hide

     */

    public void reportKeyguardSecured() {

        if (mService != null) {

            try {

                mService.reportKeyguardSecured();

            } catch (RemoteException e) {

                Log.w(TAG, REMOTE_EXCEPTION_MESSAGE, e);

            }

        }

    }



    /**

     * @hide

     * Sets the given package as the device owner.

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

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ interface IDevicePolicyManager { 
    void reportFailedPasswordAttempt(int userHandle);

    void reportSuccessfulPasswordAttempt(int userHandle);



    void reportKeyguardDismissed();

    void reportKeyguardSecured();



    boolean setDeviceOwner(in ComponentName who, String ownerName, int userId);

    ComponentName getDeviceOwnerComponent(boolean callingUserOnly);

    String getDeviceOwnerName();