summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2016-06-29 11:56:02 -0700
committerThe Android Automerger <android-build@google.com>2016-06-29 19:06:41 -0700
commit9d187a87f5b7d8cecf60307a13ea1e1333c4770b (patch)
tree086de65941df3dcbd6cb7d1345574de24d9cafae
parenta2576551f41146f76032e18040c95db5db4d3141 (diff)
downloadsdk-nougat-cts-release.tar.gz
Part of bug #29871385 Change-Id: Ibc808e1ed0a786949d7c430dc42fe134402c72c0
-rw-r--r--api/24.txt5
-rw-r--r--system-api/24.txt7
2 files changed, 10 insertions, 2 deletions
diff --git a/api/24.txt b/api/24.txt
index 3bd607bff..4f12ad4ed 100644
--- a/api/24.txt
+++ b/api/24.txt
@@ -40820,8 +40820,11 @@ package android.view {
field public static final android.os.Parcelable.Creator<android.view.Display.Mode> CREATOR;
}
- public final class DragAndDropPermissions {
+ public final class DragAndDropPermissions implements android.os.Parcelable {
+ method public int describeContents();
method public void release();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.DragAndDropPermissions> CREATOR;
}
public class DragEvent implements android.os.Parcelable {
diff --git a/system-api/24.txt b/system-api/24.txt
index 3a2f29b5f..d1c039422 100644
--- a/system-api/24.txt
+++ b/system-api/24.txt
@@ -169,6 +169,7 @@ package android {
field public static final java.lang.String READ_INSTALL_SESSIONS = "android.permission.READ_INSTALL_SESSIONS";
field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";
field public static final java.lang.String READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY";
+ field public static final java.lang.String READ_OEM_UNLOCK_STATE = "android.permission.READ_OEM_UNLOCK_STATE";
field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
field public static final java.lang.String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";
field public static final java.lang.String READ_SEARCH_INDEXABLES = "android.permission.READ_SEARCH_INDEXABLES";
@@ -6674,6 +6675,7 @@ package android.app.job {
method public abstract java.util.List<android.app.job.JobInfo> getAllPendingJobs();
method public abstract android.app.job.JobInfo getPendingJob(int);
method public abstract int schedule(android.app.job.JobInfo);
+ method public abstract int scheduleAsPackage(android.app.job.JobInfo, java.lang.String, int, java.lang.String);
field public static final int RESULT_FAILURE = 0; // 0x0
field public static final int RESULT_SUCCESS = 1; // 0x1
}
@@ -43818,8 +43820,11 @@ package android.view {
field public static final android.os.Parcelable.Creator<android.view.Display.Mode> CREATOR;
}
- public final class DragAndDropPermissions {
+ public final class DragAndDropPermissions implements android.os.Parcelable {
+ method public int describeContents();
method public void release();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator<android.view.DragAndDropPermissions> CREATOR;
}
public class DragEvent implements android.os.Parcelable {