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

Commit cc88ddd7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Implement issue #36590595: Add ability to associated a ClipData with... 

Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev am: 2d161b1d
am: 666fe849

Change-Id: I61afc96a01bc8bc5d637d65a3f9a84452babd3ed
parents 7b267af4 666fe849

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -6740,6 +6740,8 @@ package android.app.job { 
  public class JobInfo implements android.os.Parcelable {

    method public int describeContents();

    method public int getBackoffPolicy();

    method public android.content.ClipData getClipData();

    method public int getClipGrantFlags();

    method public android.os.PersistableBundle getExtras();

    method public long getFlexMillis();

    method public int getId();
@@ -6778,6 +6780,7 @@ package android.app.job { 
    method public android.app.job.JobInfo.Builder addTriggerContentUri(android.app.job.JobInfo.TriggerContentUri);

    method public android.app.job.JobInfo build();

    method public android.app.job.JobInfo.Builder setBackoffCriteria(long, int);

    method public android.app.job.JobInfo.Builder setClipData(android.content.ClipData, int);

    method public android.app.job.JobInfo.Builder setExtras(android.os.PersistableBundle);

    method public android.app.job.JobInfo.Builder setMinimumLatency(long);

    method public android.app.job.JobInfo.Builder setOverrideDeadline(long);
@@ -6806,6 +6809,8 @@ package android.app.job { 














  public class JobParameters implements android.os.Parcelable {















    method public int describeContents();













    method public android.content.ClipData getClipData();













    method public int getClipGrantFlags();















    method public android.os.PersistableBundle getExtras();















    method public int getJobId();















    method public android.os.Bundle getTransientExtras();










@@ -8810,6 +8815,7 @@ package android.content {













    method public abstract deprecated void removeStickyBroadcast(android.content.Intent);















    method public abstract deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public abstract void revokeUriPermission(android.net.Uri, int);













    method public abstract void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public abstract void sendBroadcast(android.content.Intent);















    method public abstract void sendBroadcast(android.content.Intent, java.lang.String);















    method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);










@@ -9002,6 +9008,7 @@ package android.content {













    method public deprecated void removeStickyBroadcast(android.content.Intent);















    method public deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public void revokeUriPermission(android.net.Uri, int);













    method public void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public void sendBroadcast(android.content.Intent);















    method public void sendBroadcast(android.content.Intent, java.lang.String);















    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);










@@ -40646,6 +40653,7 @@ package android.test.mock {













    method public void removeStickyBroadcast(android.content.Intent);















    method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public void revokeUriPermission(android.net.Uri, int);













    method public void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public void sendBroadcast(android.content.Intent);















    method public void sendBroadcast(android.content.Intent, java.lang.String);















    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);

























api/system-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -7168,6 +7168,8 @@ package android.app.job {













  public class JobInfo implements android.os.Parcelable {















    method public int describeContents();















    method public int getBackoffPolicy();













    method public android.content.ClipData getClipData();













    method public int getClipGrantFlags();















    method public android.os.PersistableBundle getExtras();















    method public long getFlexMillis();















    method public int getId();










@@ -7206,6 +7208,7 @@ package android.app.job {













    method public android.app.job.JobInfo.Builder addTriggerContentUri(android.app.job.JobInfo.TriggerContentUri);















    method public android.app.job.JobInfo build();















    method public android.app.job.JobInfo.Builder setBackoffCriteria(long, int);













    method public android.app.job.JobInfo.Builder setClipData(android.content.ClipData, int);















    method public android.app.job.JobInfo.Builder setExtras(android.os.PersistableBundle);















    method public android.app.job.JobInfo.Builder setMinimumLatency(long);















    method public android.app.job.JobInfo.Builder setOverrideDeadline(long);










@@ -7234,6 +7237,8 @@ package android.app.job {



























  public class JobParameters implements android.os.Parcelable {















    method public int describeContents();













    method public android.content.ClipData getClipData();













    method public int getClipGrantFlags();















    method public android.os.PersistableBundle getExtras();















    method public int getJobId();















    method public android.os.Bundle getTransientExtras();










@@ -9303,6 +9308,7 @@ package android.content {













    method public abstract deprecated void removeStickyBroadcast(android.content.Intent);















    method public abstract deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public abstract void revokeUriPermission(android.net.Uri, int);













    method public abstract void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public abstract void sendBroadcast(android.content.Intent);















    method public abstract void sendBroadcast(android.content.Intent, java.lang.String);















    method public abstract void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);










@@ -9509,6 +9515,7 @@ package android.content {













    method public deprecated void removeStickyBroadcast(android.content.Intent);















    method public deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public void revokeUriPermission(android.net.Uri, int);













    method public void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public void sendBroadcast(android.content.Intent);















    method public void sendBroadcast(android.content.Intent, java.lang.String);















    method public void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);










@@ -44113,6 +44120,7 @@ package android.test.mock {













    method public void removeStickyBroadcast(android.content.Intent);















    method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public void revokeUriPermission(android.net.Uri, int);













    method public void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public void sendBroadcast(android.content.Intent);















    method public void sendBroadcast(android.content.Intent, java.lang.String);















    method public void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);

























api/test-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -6769,6 +6769,8 @@ package android.app.job {













  public class JobInfo implements android.os.Parcelable {















    method public int describeContents();















    method public int getBackoffPolicy();













    method public android.content.ClipData getClipData();













    method public int getClipGrantFlags();















    method public android.os.PersistableBundle getExtras();















    method public long getFlexMillis();















    method public int getId();










@@ -6807,6 +6809,7 @@ package android.app.job {













    method public android.app.job.JobInfo.Builder addTriggerContentUri(android.app.job.JobInfo.TriggerContentUri);















    method public android.app.job.JobInfo build();















    method public android.app.job.JobInfo.Builder setBackoffCriteria(long, int);













    method public android.app.job.JobInfo.Builder setClipData(android.content.ClipData, int);















    method public android.app.job.JobInfo.Builder setExtras(android.os.PersistableBundle);















    method public android.app.job.JobInfo.Builder setMinimumLatency(long);















    method public android.app.job.JobInfo.Builder setOverrideDeadline(long);










@@ -6835,6 +6838,8 @@ package android.app.job {



























  public class JobParameters implements android.os.Parcelable {















    method public int describeContents();













    method public android.content.ClipData getClipData();













    method public int getClipGrantFlags();















    method public android.os.PersistableBundle getExtras();















    method public int getJobId();















    method public android.os.Bundle getTransientExtras();










@@ -8842,6 +8847,7 @@ package android.content {













    method public abstract deprecated void removeStickyBroadcast(android.content.Intent);















    method public abstract deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public abstract void revokeUriPermission(android.net.Uri, int);













    method public abstract void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public abstract void sendBroadcast(android.content.Intent);















    method public abstract void sendBroadcast(android.content.Intent, java.lang.String);















    method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);










@@ -9035,6 +9041,7 @@ package android.content {













    method public deprecated void removeStickyBroadcast(android.content.Intent);















    method public deprecated void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public void revokeUriPermission(android.net.Uri, int);













    method public void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public void sendBroadcast(android.content.Intent);















    method public void sendBroadcast(android.content.Intent, java.lang.String);















    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);










@@ -40850,6 +40857,7 @@ package android.test.mock {













    method public void removeStickyBroadcast(android.content.Intent);















    method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);















    method public void revokeUriPermission(android.net.Uri, int);













    method public void revokeUriPermission(java.lang.String, android.net.Uri, int);















    method public void sendBroadcast(android.content.Intent);















    method public void sendBroadcast(android.content.Intent, java.lang.String);















    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);

























core/java/android/app/ContextImpl.java



+12
−1




























Original line number
Diff line number
Diff line








@@ -1789,7 +1789,18 @@ class ContextImpl extends Context {













    public void revokeUriPermission(Uri uri, int modeFlags) {















         try {















            ActivityManager.getService().revokeUriPermission(













                    mMainThread.getApplicationThread(),













                    mMainThread.getApplicationThread(), null,













                    ContentProvider.getUriWithoutUserId(uri), modeFlags, resolveUserId(uri));













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    @Override













    public void revokeUriPermission(String targetPackage, Uri uri, int modeFlags) {













        try {













            ActivityManager.getService().revokeUriPermission(













                    mMainThread.getApplicationThread(), targetPackage,















                    ContentProvider.getUriWithoutUserId(uri), modeFlags, resolveUserId(uri));















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();

































core/java/android/app/IActivityManager.aidl



+2
−1




























Original line number
Diff line number
Diff line








@@ -172,7 +172,8 @@ interface IActivityManager {













            in IBinder callerToken);















    void grantUriPermission(in IApplicationThread caller, in String targetPkg, in Uri uri,















            int mode, int userId);













    void revokeUriPermission(in IApplicationThread caller, in Uri uri, int mode, int userId);













    void revokeUriPermission(in IApplicationThread caller, in String targetPkg, in Uri uri,













            int mode, int userId);















    void setActivityController(in IActivityController watcher, boolean imAMonkey);















    void showWaitingForDebugger(in IApplicationThread who, boolean waiting);















    /*