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

Commit 6235a94f authored by Michal Karpinski's avatar Michal Karpinski Committed by Rubin Xu
Browse files

Unifying method names and comments to security logging, not device logging 

Also move SecurityLog to android.app.admin package.

Bug: 27531824
Bug: 27532560
Bug: 27532564
Bug: 27532425
Change-Id: I2677afdb5685bc5d21e52c41b381b57a41e364b6
parent 54f264fc

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ LOCAL_SRC_FILES := $(call find-other-java-files,$(FRAMEWORKS_BASE_SUBDIRS)) 


# EventLogTags files.

LOCAL_SRC_FILES += \

       core/java/android/auditing/SecurityLogTags.logtags \

       core/java/android/app/admin/SecurityLogTags.logtags \

       core/java/android/content/EventLogTags.logtags \

       core/java/android/speech/tts/EventLogTags.logtags \

       core/java/android/webkit/EventLogTags.logtags \

api/current.txt

+25 −29
Original line number Diff line number Diff line
@@ -5852,7 +5852,6 @@ package android.app.admin { 
    method public boolean getCrossProfileContactsSearchDisabled(android.content.ComponentName);

    method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);

    method public int getCurrentFailedPasswordAttempts();

    method public boolean getDeviceLoggingEnabled(android.content.ComponentName);

    method public java.lang.String getDeviceOwnerLockScreenInfo();

    method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);

    method public int getKeyguardDisabledFeatures(android.content.ComponentName);
@@ -5901,6 +5900,7 @@ package android.app.admin { 
    method public boolean isMasterVolumeMuted(android.content.ComponentName);

    method public boolean isProfileOwnerApp(java.lang.String);

    method public boolean isProvisioningAllowed(java.lang.String);

    method public boolean isSecurityLoggingEnabled(android.content.ComponentName);

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

    method public void lockNow();

    method public void reboot(android.content.ComponentName);
@@ -5910,8 +5910,8 @@ package android.app.admin { 
    method public boolean removeUser(android.content.ComponentName, android.os.UserHandle);

    method public boolean requestBugreport(android.content.ComponentName);

    method public boolean resetPassword(java.lang.String, int);

    method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrieveDeviceLogs(android.content.ComponentName);

    method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrievePreviousDeviceLogs(android.content.ComponentName);

    method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(android.content.ComponentName);

    method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(android.content.ComponentName);

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

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

    method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
@@ -5923,7 +5923,6 @@ package android.app.admin { 
    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;

    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

    method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);

    method public void setDeviceLoggingEnabled(android.content.ComponentName, boolean);

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

    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);
@@ -5956,6 +5955,7 @@ package android.app.admin { 
    method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);

    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public void setSecurityLoggingEnabled(android.content.ComponentName, boolean);

    method public void setShortSupportMessage(android.content.ComponentName, java.lang.String);

    method public boolean setStatusBarDisabled(android.content.ComponentName, boolean);

    method public int setStorageEncryption(android.content.ComponentName, boolean);
@@ -6041,6 +6041,27 @@ package android.app.admin { 
    field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2

  }













  public class SecurityLog {













    ctor public SecurityLog();













    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_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













  }

























  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.Object getData();













    method public int getTag();













    method public long getTimeNanos();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.admin.SecurityLog.SecurityEvent> CREATOR;













  }



























  public class SystemUpdatePolicy implements android.os.Parcelable {















    method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();















    method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();










@@ -6581,31 +6602,6 @@ package android.appwidget {



























}



























package android.auditing {

























  public class SecurityLog {













    ctor public SecurityLog();













    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_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













  }

























  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.Object getData();













    method public int getTag();













    method public long getTimeNanos();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.auditing.SecurityLog.SecurityEvent> CREATOR;













  }

























}



























package android.bluetooth {





























  public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {

























api/system-current.txt



+25
−29




























Original line number
Diff line number
Diff line








@@ -5991,7 +5991,6 @@ package android.app.admin {













    method public int getCurrentFailedPasswordAttempts();















    method public deprecated java.lang.String getDeviceInitializerApp();















    method public deprecated android.content.ComponentName getDeviceInitializerComponent();













    method public boolean getDeviceLoggingEnabled(android.content.ComponentName);















    method public java.lang.String getDeviceOwner();















    method public java.lang.String getDeviceOwnerLockScreenInfo();















    method public java.lang.String getDeviceOwnerNameOnAnyUser();










@@ -6047,6 +6046,7 @@ package android.app.admin {













    method public boolean isMasterVolumeMuted(android.content.ComponentName);















    method public boolean isProfileOwnerApp(java.lang.String);















    method public boolean isProvisioningAllowed(java.lang.String);













    method public boolean isSecurityLoggingEnabled(android.content.ComponentName);















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















    method public void lockNow();















    method public void notifyPendingSystemUpdate(long);









@@ -6057,8 +6057,8 @@ package android.app.admin {













    method public boolean removeUser(android.content.ComponentName, android.os.UserHandle);















    method public boolean requestBugreport(android.content.ComponentName);















    method public boolean resetPassword(java.lang.String, int);













    method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrieveDeviceLogs(android.content.ComponentName);













    method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrievePreviousDeviceLogs(android.content.ComponentName);













    method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(android.content.ComponentName);













    method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(android.content.ComponentName);















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















    method public deprecated boolean setActiveProfileOwner(android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException;















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









@@ -6071,7 +6071,6 @@ package android.app.admin {













    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;















    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);















    method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);













    method public void setDeviceLoggingEnabled(android.content.ComponentName, boolean);















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















    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);















    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);










@@ -6104,6 +6103,7 @@ package android.app.admin {













    method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);















    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);















    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);













    method public void setSecurityLoggingEnabled(android.content.ComponentName, boolean);















    method public void setShortSupportMessage(android.content.ComponentName, java.lang.String);















    method public boolean setStatusBarDisabled(android.content.ComponentName, boolean);















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










@@ -6198,6 +6198,27 @@ package android.app.admin {













    field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2















  }



























  public class SecurityLog {













    ctor public SecurityLog();













    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_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













  }

























  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.Object getData();













    method public int getTag();













    method public long getTimeNanos();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.admin.SecurityLog.SecurityEvent> CREATOR;













  }



























  public class SystemUpdatePolicy implements android.os.Parcelable {















    method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();















    method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();










@@ -6848,31 +6869,6 @@ package android.appwidget {



























}



























package android.auditing {

























  public class SecurityLog {













    ctor public SecurityLog();













    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_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













  }

























  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.Object getData();













    method public int getTag();













    method public long getTimeNanos();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.auditing.SecurityLog.SecurityEvent> CREATOR;













  }

























}



























package android.bluetooth {





























  public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {

























api/test-current.txt



+25
−29




























Original line number
Diff line number
Diff line








@@ -5856,7 +5856,6 @@ package android.app.admin {













    method public boolean getCrossProfileContactsSearchDisabled(android.content.ComponentName);















    method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);















    method public int getCurrentFailedPasswordAttempts();













    method public boolean getDeviceLoggingEnabled(android.content.ComponentName);















    method public java.lang.String getDeviceOwnerLockScreenInfo();















    method public java.util.List<byte[]> getInstalledCaCerts(android.content.ComponentName);















    method public int getKeyguardDisabledFeatures(android.content.ComponentName);










@@ -5905,6 +5904,7 @@ package android.app.admin {













    method public boolean isMasterVolumeMuted(android.content.ComponentName);















    method public boolean isProfileOwnerApp(java.lang.String);















    method public boolean isProvisioningAllowed(java.lang.String);













    method public boolean isSecurityLoggingEnabled(android.content.ComponentName);















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















    method public void lockNow();















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









@@ -5914,8 +5914,8 @@ package android.app.admin {













    method public boolean removeUser(android.content.ComponentName, android.os.UserHandle);















    method public boolean requestBugreport(android.content.ComponentName);















    method public boolean resetPassword(java.lang.String, int);













    method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrieveDeviceLogs(android.content.ComponentName);













    method public java.util.List<android.auditing.SecurityLog.SecurityEvent> retrievePreviousDeviceLogs(android.content.ComponentName);













    method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(android.content.ComponentName);













    method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(android.content.ComponentName);















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















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















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









@@ -5927,7 +5927,6 @@ package android.app.admin {













    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;















    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);















    method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean);













    method public void setDeviceLoggingEnabled(android.content.ComponentName, boolean);















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















    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);















    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);










@@ -5960,6 +5959,7 @@ package android.app.admin {













    method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);















    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);















    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);













    method public void setSecurityLoggingEnabled(android.content.ComponentName, boolean);















    method public void setShortSupportMessage(android.content.ComponentName, java.lang.String);















    method public boolean setStatusBarDisabled(android.content.ComponentName, boolean);















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










@@ -6045,6 +6045,27 @@ package android.app.admin {













    field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2















  }



























  public class SecurityLog {













    ctor public SecurityLog();













    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_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













  }

























  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.Object getData();













    method public int getTag();













    method public long getTimeNanos();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.app.admin.SecurityLog.SecurityEvent> CREATOR;













  }



























  public class SystemUpdatePolicy implements android.os.Parcelable {















    method public static android.app.admin.SystemUpdatePolicy createAutomaticInstallPolicy();















    method public static android.app.admin.SystemUpdatePolicy createPostponeInstallPolicy();










@@ -6585,31 +6606,6 @@ package android.appwidget {



























}



























package android.auditing {

























  public class SecurityLog {













    ctor public SecurityLog();













    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_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













  }

























  public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.Object getData();













    method public int getTag();













    method public long getTimeNanos();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.auditing.SecurityLog.SecurityEvent> CREATOR;













  }

























}



























package android.bluetooth {





























  public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {

























core/java/android/app/admin/DeviceAdminReceiver.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -268,7 +268,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {













            "android.app.action.BUGREPORT_SHARE";































    /**













     * Broadcast action: notify that a new batch of device logs is ready to be collected.













     * Broadcast action: notify that a new batch of security logs is ready to be collected.















     * @hide















     */















    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)










@@ -623,13 +623,13 @@ public class DeviceAdminReceiver extends BroadcastReceiver {













    }































    /**













     * Called when a new batch of device logs can be retrieved.













     * Called when a new batch of security logs can be retrieved.















     *















     * <p>This callback is only applicable to device owners.















     *















     * @param context The running context as per {@link #onReceive}.















     * @param intent The received intent as per {@link #onReceive}.













     * @see DevicePolicyManager#retrieveDeviceLogs(ComponentName)













     * @see DevicePolicyManager#retrieveSecurityLogs(ComponentName)















     */















    public void onSecurityLogsAvailable(Context context, Intent intent) {















    }