Merge "Unhiding network logging API" (803abe73) · Commits · e / os / android_frameworks_base

api/current.txt

+27 −0

Original line number	Diff line number	Diff line
		@@ -5946,6 +5946,13 @@ package android.app {

		package android.app.admin {

		public final class ConnectEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
		method public java.lang.String getIpAddress();
		method public int getPort();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.ConnectEvent> CREATOR;
		}

		public final class DeviceAdminInfo implements android.os.Parcelable {
		ctor public DeviceAdminInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int describeContents();
		@@ -5986,6 +5993,7 @@ package android.app.admin {
		method public void onEnabled(android.content.Context, android.content.Intent);
		method public void onLockTaskModeEntering(android.content.Context, android.content.Intent, java.lang.String);
		method public void onLockTaskModeExiting(android.content.Context, android.content.Intent);
		method public void onNetworkLogsAvailable(android.content.Context, android.content.Intent, long, int);
		method public void onPasswordChanged(android.content.Context, android.content.Intent);
		method public void onPasswordExpiring(android.content.Context, android.content.Intent);
		method public void onPasswordFailed(android.content.Context, android.content.Intent);
		@@ -6090,6 +6098,7 @@ package android.app.admin {
		method public boolean isLockTaskPermitted(java.lang.String);
		method public boolean isManagedProfile(android.content.ComponentName);
		method public boolean isMasterVolumeMuted(android.content.ComponentName);
		method public boolean isNetworkLoggingEnabled(android.content.ComponentName);
		method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public boolean isProfileOwnerApp(java.lang.String);
		method public boolean isProvisioningAllowed(java.lang.String);
		@@ -6103,6 +6112,7 @@ 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.app.admin.NetworkEvent> retrieveNetworkLogs(android.content.ComponentName, long);
		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);
		@@ -6126,6 +6136,7 @@ package android.app.admin {
		method public void setMasterVolumeMuted(android.content.ComponentName, boolean);
		method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		method public void setNetworkLoggingEnabled(android.content.ComponentName, boolean);
		method public void setOrganizationColor(android.content.ComponentName, int);
		method public void setOrganizationName(android.content.ComponentName, java.lang.CharSequence);
		method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean);
		@@ -6240,6 +6251,22 @@ package android.app.admin {
		field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
		}

		public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
		method public java.lang.String getHostname();
		method public java.lang.String[] getIpAddresses();
		method public int getIpAddressesCount();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.DnsEvent> CREATOR;
		}

		public abstract class NetworkEvent implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.String getPackageName();
		method public long getTimestamp();
		method public abstract void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.NetworkEvent> CREATOR;
		}

		public class SecurityLog {
		ctor public SecurityLog();
		field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452

api/system-current.txt

+27 −0

Original line number	Diff line number	Diff line
		@@ -6118,6 +6118,13 @@ package android.app {

		package android.app.admin {

		public final class ConnectEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
		method public java.lang.String getIpAddress();
		method public int getPort();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.ConnectEvent> CREATOR;
		}

		public final class DeviceAdminInfo implements android.os.Parcelable {
		ctor public DeviceAdminInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int describeContents();
		@@ -6158,6 +6165,7 @@ package android.app.admin {
		method public void onEnabled(android.content.Context, android.content.Intent);
		method public void onLockTaskModeEntering(android.content.Context, android.content.Intent, java.lang.String);
		method public void onLockTaskModeExiting(android.content.Context, android.content.Intent);
		method public void onNetworkLogsAvailable(android.content.Context, android.content.Intent, long, int);
		method public void onPasswordChanged(android.content.Context, android.content.Intent);
		method public void onPasswordExpiring(android.content.Context, android.content.Intent);
		method public void onPasswordFailed(android.content.Context, android.content.Intent);
		@@ -6273,6 +6281,7 @@ package android.app.admin {
		method public boolean isLockTaskPermitted(java.lang.String);
		method public boolean isManagedProfile(android.content.ComponentName);
		method public boolean isMasterVolumeMuted(android.content.ComponentName);
		method public boolean isNetworkLoggingEnabled(android.content.ComponentName);
		method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public boolean isProfileOwnerApp(java.lang.String);
		method public boolean isProvisioningAllowed(java.lang.String);
		@@ -6287,6 +6296,7 @@ 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.app.admin.NetworkEvent> retrieveNetworkLogs(android.content.ComponentName, long);
		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);
		@@ -6311,6 +6321,7 @@ package android.app.admin {
		method public void setMasterVolumeMuted(android.content.ComponentName, boolean);
		method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		method public void setNetworkLoggingEnabled(android.content.ComponentName, boolean);
		method public void setOrganizationColor(android.content.ComponentName, int);
		method public void setOrganizationName(android.content.ComponentName, java.lang.CharSequence);
		method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean);
		@@ -6434,6 +6445,22 @@ package android.app.admin {
		field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
		}

		public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
		method public java.lang.String getHostname();
		method public java.lang.String[] getIpAddresses();
		method public int getIpAddressesCount();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.DnsEvent> CREATOR;
		}

		public abstract class NetworkEvent implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.String getPackageName();
		method public long getTimestamp();
		method public abstract void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.NetworkEvent> CREATOR;
		}

		public class SecurityLog {
		ctor public SecurityLog();
		field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452

api/test-current.txt

+27 −0

Original line number	Diff line number	Diff line
		@@ -5963,6 +5963,13 @@ package android.app {

		package android.app.admin {

		public final class ConnectEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
		method public java.lang.String getIpAddress();
		method public int getPort();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.ConnectEvent> CREATOR;
		}

		public final class DeviceAdminInfo implements android.os.Parcelable {
		ctor public DeviceAdminInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int describeContents();
		@@ -6003,6 +6010,7 @@ package android.app.admin {
		method public void onEnabled(android.content.Context, android.content.Intent);
		method public void onLockTaskModeEntering(android.content.Context, android.content.Intent, java.lang.String);
		method public void onLockTaskModeExiting(android.content.Context, android.content.Intent);
		method public void onNetworkLogsAvailable(android.content.Context, android.content.Intent, long, int);
		method public void onPasswordChanged(android.content.Context, android.content.Intent);
		method public void onPasswordExpiring(android.content.Context, android.content.Intent);
		method public void onPasswordFailed(android.content.Context, android.content.Intent);
		@@ -6112,6 +6120,7 @@ package android.app.admin {
		method public boolean isLockTaskPermitted(java.lang.String);
		method public boolean isManagedProfile(android.content.ComponentName);
		method public boolean isMasterVolumeMuted(android.content.ComponentName);
		method public boolean isNetworkLoggingEnabled(android.content.ComponentName);
		method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public boolean isProfileOwnerApp(java.lang.String);
		method public boolean isProvisioningAllowed(java.lang.String);
		@@ -6125,6 +6134,7 @@ 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.app.admin.NetworkEvent> retrieveNetworkLogs(android.content.ComponentName, long);
		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);
		@@ -6148,6 +6158,7 @@ package android.app.admin {
		method public void setMasterVolumeMuted(android.content.ComponentName, boolean);
		method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		method public void setNetworkLoggingEnabled(android.content.ComponentName, boolean);
		method public void setOrganizationColor(android.content.ComponentName, int);
		method public void setOrganizationName(android.content.ComponentName, java.lang.CharSequence);
		method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean);
		@@ -6262,6 +6273,22 @@ package android.app.admin {
		field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
		}

		public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
		method public java.lang.String getHostname();
		method public java.lang.String[] getIpAddresses();
		method public int getIpAddressesCount();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.DnsEvent> CREATOR;
		}

		public abstract class NetworkEvent implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.String getPackageName();
		method public long getTimestamp();
		method public abstract void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.admin.NetworkEvent> CREATOR;
		}

		public class SecurityLog {
		ctor public SecurityLog();
		field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452

core/java/android/app/admin/ConnectEvent.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.os.Parcelable;

		/**
		* A class that represents a connect library call event.
		* @hide
		*/
		public final class ConnectEvent extends NetworkEvent implements Parcelable {

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -702,8 +702,6 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* @param batchToken The token representing the current batch of network logs.
		* @param networkLogsCount The total count of events in the current batch of network logs.
		* @see DevicePolicyManager#retrieveNetworkLogs(ComponentName)
		*
		* @hide
		*/
		public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,
		int networkLogsCount) {