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

Commit d55b7314 authored by Michal Karpinski's avatar Michal Karpinski
Browse files

Unhiding network logging API 

Unhiding network logging feature API on master in order to add CTS
tests and the like. Feature will still be CPd to MR2 as hidden.

Bug: 29748723
Change-Id: Iae3957d8e678c82b67654cd9f442436ba44ae728
parent da9d3ad3

api/current.txt

+27 −0
Original line number Diff line number Diff line
@@ -5929,6 +5929,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();










@@ -5969,6 +5976,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);










@@ -6073,6 +6081,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);









@@ -6086,6 +6095,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);









@@ -6109,6 +6119,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);










@@ -6222,6 +6233,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








@@ -6101,6 +6101,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();










@@ -6141,6 +6148,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);










@@ -6254,6 +6262,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);









@@ -6268,6 +6277,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);









@@ -6292,6 +6302,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);










@@ -6414,6 +6425,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








@@ -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);










@@ -6093,6 +6101,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);









@@ -6106,6 +6115,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);









@@ -6129,6 +6139,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);










@@ -6242,6 +6253,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) {