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

Commit dd6a4331 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Respond to API council feedback." into oc-dev am: 77cc43e0 

am: 86e27f65

Change-Id: I7933a8ba6858d38423b29a52dfc5f9f65c641faf
parents 4226800a 86e27f65

api/current.txt

+4 −10
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ package android { 
    field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";

    field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";

    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";

    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";

    field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";

    field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";

    field public static final java.lang.String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";

    field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";

    field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";

    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";

    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";

    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";

    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
@@ -7013,8 +7012,8 @@ package android.app.usage { 
















  public final class StorageStats implements android.os.Parcelable {







  public final class StorageStats implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();














    method public long getAppBytes();











    method public long getCacheBytes();







    method public long getCacheBytes();











    method public long getCodeBytes();














    method public long getDataBytes();







    method public long getDataBytes();











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







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











    field public static final android.os.Parcelable.Creator<android.app.usage.StorageStats> CREATOR;







    field public static final android.os.Parcelable.Creator<android.app.usage.StorageStats> CREATOR;










@@ -30699,7 +30698,6 @@ package android.os {









    method public android.util.SizeF getSizeF(java.lang.String);







    method public android.util.SizeF getSizeF(java.lang.String);











    method public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);







    method public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);











    method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);







    method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);











    method public java.util.UUID getUuid(java.lang.String);














    method public boolean hasFileDescriptors();







    method public boolean hasFileDescriptors();











    method public void putAll(android.os.Bundle);







    method public void putAll(android.os.Bundle);











    method public void putBinder(java.lang.String, android.os.IBinder);







    method public void putBinder(java.lang.String, android.os.IBinder);









@@ -30724,7 +30722,6 @@ package android.os {









    method public void putSizeF(java.lang.String, android.util.SizeF);







    method public void putSizeF(java.lang.String, android.util.SizeF);











    method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);







    method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);











    method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);







    method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);











    method public void putUuid(java.lang.String, java.util.UUID);














    method public void readFromParcel(android.os.Parcel);







    method public void readFromParcel(android.os.Parcel);











    method public void setClassLoader(java.lang.ClassLoader);







    method public void setClassLoader(java.lang.ClassLoader);











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







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










@@ -31254,7 +31251,6 @@ package android.os {









    method public final <T> void readTypedArray(T[], android.os.Parcelable.Creator<T>);







    method public final <T> void readTypedArray(T[], android.os.Parcelable.Creator<T>);











    method public final <T> void readTypedList(java.util.List<T>, android.os.Parcelable.Creator<T>);







    method public final <T> void readTypedList(java.util.List<T>, android.os.Parcelable.Creator<T>);











    method public final <T> T readTypedObject(android.os.Parcelable.Creator<T>);







    method public final <T> T readTypedObject(android.os.Parcelable.Creator<T>);











    method public final java.util.UUID readUuid();














    method public final java.lang.Object readValue(java.lang.ClassLoader);







    method public final java.lang.Object readValue(java.lang.ClassLoader);











    method public final void recycle();







    method public final void recycle();











    method public final void setDataCapacity(int);







    method public final void setDataCapacity(int);










@@ -31300,7 +31296,6 @@ package android.os {









    method public final <T extends android.os.Parcelable> void writeTypedArray(T[], int);







    method public final <T extends android.os.Parcelable> void writeTypedArray(T[], int);











    method public final <T extends android.os.Parcelable> void writeTypedList(java.util.List<T>);







    method public final <T extends android.os.Parcelable> void writeTypedList(java.util.List<T>);











    method public final <T extends android.os.Parcelable> void writeTypedObject(T, int);







    method public final <T extends android.os.Parcelable> void writeTypedObject(T, int);











    method public final void writeUuid(java.util.UUID);














    method public final void writeValue(java.lang.Object);







    method public final void writeValue(java.lang.Object);











    field public static final android.os.Parcelable.Creator<java.lang.String> STRING_CREATOR;







    field public static final android.os.Parcelable.Creator<java.lang.String> STRING_CREATOR;











  }







  }










@@ -31932,9 +31927,9 @@ package android.os.storage {









  }







  }



























  public class StorageManager {







  public class StorageManager {











    method public void allocateBytes(java.util.UUID, long, int) throws java.io.IOException;







    method public void allocateBytes(java.util.UUID, long) throws java.io.IOException;











    method public void allocateBytes(java.io.FileDescriptor, long, int) throws java.io.IOException;







    method public void allocateBytes(java.io.FileDescriptor, long) throws java.io.IOException;











    method public long getAllocatableBytes(java.util.UUID, int) throws java.io.IOException;







    method public long getAllocatableBytes(java.util.UUID) throws java.io.IOException;











    method public long getCacheQuotaBytes(java.util.UUID) throws java.io.IOException;







    method public long getCacheQuotaBytes(java.util.UUID) throws java.io.IOException;











    method public long getCacheSizeBytes(java.util.UUID) throws java.io.IOException;







    method public long getCacheSizeBytes(java.util.UUID) throws java.io.IOException;











    method public java.lang.String getMountedObbPath(java.lang.String);







    method public java.lang.String getMountedObbPath(java.lang.String);









@@ -31955,7 +31950,6 @@ package android.os.storage {









    field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";







    field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";











    field public static final java.lang.String EXTRA_REQUESTED_BYTES = "android.os.storage.extra.REQUESTED_BYTES";







    field public static final java.lang.String EXTRA_REQUESTED_BYTES = "android.os.storage.extra.REQUESTED_BYTES";











    field public static final java.lang.String EXTRA_UUID = "android.os.storage.extra.UUID";







    field public static final java.lang.String EXTRA_UUID = "android.os.storage.extra.UUID";











    field public static final int FLAG_ALLOCATE_AGGRESSIVE = 1; // 0x1














    field public static final java.util.UUID UUID_DEFAULT;







    field public static final java.util.UUID UUID_DEFAULT;











  }







  }









































api/removed.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -24,6 +24,10 @@ package android.app.admin {





























package android.app.usage {







package android.app.usage {


































  public final class StorageStats implements android.os.Parcelable {














    method public deprecated long getCodeBytes();














  }


























  public class StorageStatsManager {







  public class StorageStatsManager {











    method public deprecated long getFreeBytes(java.lang.String) throws java.io.IOException;







    method public deprecated long getFreeBytes(java.lang.String) throws java.io.IOException;











    method public deprecated long getTotalBytes(java.lang.String) throws java.io.IOException;







    method public deprecated long getTotalBytes(java.lang.String) throws java.io.IOException;

































api/system-current.txt



+4
−5




























Original line number
Original line
Diff line number
Diff line








@@ -7482,8 +7482,8 @@ package android.app.usage {

























  public final class StorageStats implements android.os.Parcelable {







  public final class StorageStats implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();














    method public long getAppBytes();











    method public long getCacheBytes();







    method public long getCacheBytes();











    method public long getCodeBytes();














    method public long getDataBytes();







    method public long getDataBytes();











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







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











    field public static final android.os.Parcelable.Creator<android.app.usage.StorageStats> CREATOR;







    field public static final android.os.Parcelable.Creator<android.app.usage.StorageStats> CREATOR;










@@ -33461,7 +33461,6 @@ package android.os {









    method public android.util.SizeF getSizeF(java.lang.String);







    method public android.util.SizeF getSizeF(java.lang.String);











    method public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);







    method public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);











    method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);







    method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);











    method public java.util.UUID getUuid(java.lang.String);














    method public boolean hasFileDescriptors();







    method public boolean hasFileDescriptors();











    method public void putAll(android.os.Bundle);







    method public void putAll(android.os.Bundle);











    method public void putBinder(java.lang.String, android.os.IBinder);







    method public void putBinder(java.lang.String, android.os.IBinder);









@@ -33486,7 +33485,6 @@ package android.os {









    method public void putSizeF(java.lang.String, android.util.SizeF);







    method public void putSizeF(java.lang.String, android.util.SizeF);











    method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);







    method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);











    method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);







    method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);











    method public void putUuid(java.lang.String, java.util.UUID);














    method public void readFromParcel(android.os.Parcel);







    method public void readFromParcel(android.os.Parcel);











    method public void setClassLoader(java.lang.ClassLoader);







    method public void setClassLoader(java.lang.ClassLoader);











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







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










@@ -34048,7 +34046,6 @@ package android.os {









    method public final <T> void readTypedArray(T[], android.os.Parcelable.Creator<T>);







    method public final <T> void readTypedArray(T[], android.os.Parcelable.Creator<T>);











    method public final <T> void readTypedList(java.util.List<T>, android.os.Parcelable.Creator<T>);







    method public final <T> void readTypedList(java.util.List<T>, android.os.Parcelable.Creator<T>);











    method public final <T> T readTypedObject(android.os.Parcelable.Creator<T>);







    method public final <T> T readTypedObject(android.os.Parcelable.Creator<T>);











    method public final java.util.UUID readUuid();














    method public final java.lang.Object readValue(java.lang.ClassLoader);







    method public final java.lang.Object readValue(java.lang.ClassLoader);











    method public final void recycle();







    method public final void recycle();











    method public final void setDataCapacity(int);







    method public final void setDataCapacity(int);










@@ -34094,7 +34091,6 @@ package android.os {









    method public final <T extends android.os.Parcelable> void writeTypedArray(T[], int);







    method public final <T extends android.os.Parcelable> void writeTypedArray(T[], int);











    method public final <T extends android.os.Parcelable> void writeTypedList(java.util.List<T>);







    method public final <T extends android.os.Parcelable> void writeTypedList(java.util.List<T>);











    method public final <T extends android.os.Parcelable> void writeTypedObject(T, int);







    method public final <T extends android.os.Parcelable> void writeTypedObject(T, int);











    method public final void writeUuid(java.util.UUID);














    method public final void writeValue(java.lang.Object);







    method public final void writeValue(java.lang.Object);











    field public static final android.os.Parcelable.Creator<java.lang.String> STRING_CREATOR;







    field public static final android.os.Parcelable.Creator<java.lang.String> STRING_CREATOR;











  }







  }










@@ -34832,8 +34828,11 @@ package android.os.storage {









  }







  }



























  public class StorageManager {







  public class StorageManager {














    method public void allocateBytes(java.util.UUID, long) throws java.io.IOException;











    method public void allocateBytes(java.util.UUID, long, int) throws java.io.IOException;







    method public void allocateBytes(java.util.UUID, long, int) throws java.io.IOException;














    method public void allocateBytes(java.io.FileDescriptor, long) throws java.io.IOException;











    method public void allocateBytes(java.io.FileDescriptor, long, int) throws java.io.IOException;







    method public void allocateBytes(java.io.FileDescriptor, long, int) throws java.io.IOException;














    method public long getAllocatableBytes(java.util.UUID) throws java.io.IOException;











    method public long getAllocatableBytes(java.util.UUID, int) throws java.io.IOException;







    method public long getAllocatableBytes(java.util.UUID, int) throws java.io.IOException;











    method public long getCacheQuotaBytes(java.util.UUID) throws java.io.IOException;







    method public long getCacheQuotaBytes(java.util.UUID) throws java.io.IOException;











    method public long getCacheSizeBytes(java.util.UUID) throws java.io.IOException;







    method public long getCacheSizeBytes(java.util.UUID) throws java.io.IOException;

























api/system-removed.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -22,6 +22,10 @@ package android.app.admin {





























package android.app.usage {







package android.app.usage {


































  public final class StorageStats implements android.os.Parcelable {














    method public deprecated long getCodeBytes();














  }


























  public class StorageStatsManager {







  public class StorageStatsManager {











    method public deprecated long getFreeBytes(java.lang.String) throws java.io.IOException;







    method public deprecated long getFreeBytes(java.lang.String) throws java.io.IOException;











    method public deprecated long getTotalBytes(java.lang.String) throws java.io.IOException;







    method public deprecated long getTotalBytes(java.lang.String) throws java.io.IOException;

































api/test-current.txt



+4
−10




























Original line number
Original line
Diff line number
Diff line








@@ -15,7 +15,6 @@ package android {









    field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";







    field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";











    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";







    field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";











    field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";







    field public static final java.lang.String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";











    field public static final java.lang.String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";














    field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";







    field public static final java.lang.String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";











    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";







    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";











    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";







    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";










@@ -7043,8 +7042,8 @@ package android.app.usage {

























  public final class StorageStats implements android.os.Parcelable {







  public final class StorageStats implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();














    method public long getAppBytes();











    method public long getCacheBytes();







    method public long getCacheBytes();











    method public long getCodeBytes();














    method public long getDataBytes();







    method public long getDataBytes();











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







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











    field public static final android.os.Parcelable.Creator<android.app.usage.StorageStats> CREATOR;







    field public static final android.os.Parcelable.Creator<android.app.usage.StorageStats> CREATOR;










@@ -30807,7 +30806,6 @@ package android.os {









    method public android.util.SizeF getSizeF(java.lang.String);







    method public android.util.SizeF getSizeF(java.lang.String);











    method public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);







    method public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(java.lang.String);











    method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);







    method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String);











    method public java.util.UUID getUuid(java.lang.String);














    method public boolean hasFileDescriptors();







    method public boolean hasFileDescriptors();











    method public void putAll(android.os.Bundle);







    method public void putAll(android.os.Bundle);











    method public void putBinder(java.lang.String, android.os.IBinder);







    method public void putBinder(java.lang.String, android.os.IBinder);









@@ -30832,7 +30830,6 @@ package android.os {









    method public void putSizeF(java.lang.String, android.util.SizeF);







    method public void putSizeF(java.lang.String, android.util.SizeF);











    method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);







    method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>);











    method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);







    method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>);











    method public void putUuid(java.lang.String, java.util.UUID);














    method public void readFromParcel(android.os.Parcel);







    method public void readFromParcel(android.os.Parcel);











    method public void setClassLoader(java.lang.ClassLoader);







    method public void setClassLoader(java.lang.ClassLoader);











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







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










@@ -31383,7 +31380,6 @@ package android.os {









    method public final <T> void readTypedArray(T[], android.os.Parcelable.Creator<T>);







    method public final <T> void readTypedArray(T[], android.os.Parcelable.Creator<T>);











    method public final <T> void readTypedList(java.util.List<T>, android.os.Parcelable.Creator<T>);







    method public final <T> void readTypedList(java.util.List<T>, android.os.Parcelable.Creator<T>);











    method public final <T> T readTypedObject(android.os.Parcelable.Creator<T>);







    method public final <T> T readTypedObject(android.os.Parcelable.Creator<T>);











    method public final java.util.UUID readUuid();














    method public final java.lang.Object readValue(java.lang.ClassLoader);







    method public final java.lang.Object readValue(java.lang.ClassLoader);











    method public final void recycle();







    method public final void recycle();











    method public final void setDataCapacity(int);







    method public final void setDataCapacity(int);










@@ -31429,7 +31425,6 @@ package android.os {









    method public final <T extends android.os.Parcelable> void writeTypedArray(T[], int);







    method public final <T extends android.os.Parcelable> void writeTypedArray(T[], int);











    method public final <T extends android.os.Parcelable> void writeTypedList(java.util.List<T>);







    method public final <T extends android.os.Parcelable> void writeTypedList(java.util.List<T>);











    method public final <T extends android.os.Parcelable> void writeTypedObject(T, int);







    method public final <T extends android.os.Parcelable> void writeTypedObject(T, int);











    method public final void writeUuid(java.util.UUID);














    method public final void writeValue(java.lang.Object);







    method public final void writeValue(java.lang.Object);











    field public static final android.os.Parcelable.Creator<java.lang.String> STRING_CREATOR;







    field public static final android.os.Parcelable.Creator<java.lang.String> STRING_CREATOR;











  }







  }










@@ -32065,9 +32060,9 @@ package android.os.storage {









  }







  }



























  public class StorageManager {







  public class StorageManager {











    method public void allocateBytes(java.util.UUID, long, int) throws java.io.IOException;







    method public void allocateBytes(java.util.UUID, long) throws java.io.IOException;











    method public void allocateBytes(java.io.FileDescriptor, long, int) throws java.io.IOException;







    method public void allocateBytes(java.io.FileDescriptor, long) throws java.io.IOException;











    method public long getAllocatableBytes(java.util.UUID, int) throws java.io.IOException;







    method public long getAllocatableBytes(java.util.UUID) throws java.io.IOException;











    method public long getCacheQuotaBytes(java.util.UUID) throws java.io.IOException;







    method public long getCacheQuotaBytes(java.util.UUID) throws java.io.IOException;











    method public long getCacheSizeBytes(java.util.UUID) throws java.io.IOException;







    method public long getCacheSizeBytes(java.util.UUID) throws java.io.IOException;











    method public java.lang.String getMountedObbPath(java.lang.String);







    method public java.lang.String getMountedObbPath(java.lang.String);









@@ -32088,7 +32083,6 @@ package android.os.storage {









    field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";







    field public static final java.lang.String ACTION_MANAGE_STORAGE = "android.os.storage.action.MANAGE_STORAGE";











    field public static final java.lang.String EXTRA_REQUESTED_BYTES = "android.os.storage.extra.REQUESTED_BYTES";







    field public static final java.lang.String EXTRA_REQUESTED_BYTES = "android.os.storage.extra.REQUESTED_BYTES";











    field public static final java.lang.String EXTRA_UUID = "android.os.storage.extra.UUID";







    field public static final java.lang.String EXTRA_UUID = "android.os.storage.extra.UUID";











    field public static final int FLAG_ALLOCATE_AGGRESSIVE = 1; // 0x1














    field public static final java.util.UUID UUID_DEFAULT;







    field public static final java.util.UUID UUID_DEFAULT;











  }







  }