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

Commit 22433a33 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev

parents 0d96264b a750a63d

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -3761,7 +3761,7 @@ package android.app { 
    method public void requestUsageTimeReport(android.app.PendingIntent);

    method public android.os.Bundle toBundle();

    method public void update(android.app.ActivityOptions);

    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.usage_time";

    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";

    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT_PACKAGES = "android.usage_time_packages";

  }










@@ -5197,6 +5197,7 @@ package android.app {













    method public void send(int, android.app.PendingIntent.OnFinished, android.os.Handler) throws android.app.PendingIntent.CanceledException;















    method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler) throws android.app.PendingIntent.CanceledException;















    method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler, java.lang.String) throws android.app.PendingIntent.CanceledException;













    method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler, java.lang.String, android.os.Bundle) throws android.app.PendingIntent.CanceledException;















    method public static void writePendingIntentOrNullToParcel(android.app.PendingIntent, android.os.Parcel);















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















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

























api/system-current.txt



+14
−1




























Original line number
Diff line number
Diff line








@@ -3854,7 +3854,7 @@ package android.app {













    method public void requestUsageTimeReport(android.app.PendingIntent);















    method public android.os.Bundle toBundle();















    method public void update(android.app.ActivityOptions);













    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.usage_time";













    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";















    field public static final java.lang.String EXTRA_USAGE_TIME_REPORT_PACKAGES = "android.usage_time_packages";















  }
























@@ -4186,6 +4186,12 @@ package android.app {













    method public int getWidth();















  }



























  public class BroadcastOptions {













    method public static android.app.BroadcastOptions makeBasic();













    method public void setTemporaryAppWhitelistDuration(long);













    method public android.os.Bundle toBundle();













  }



























  public class DatePickerDialog extends android.app.AlertDialog implements android.widget.DatePicker.OnDateChangedListener android.content.DialogInterface.OnClickListener {















    ctor public DatePickerDialog(android.content.Context, android.app.DatePickerDialog.OnDateSetListener, int, int, int);















    ctor public DatePickerDialog(android.content.Context, int, android.app.DatePickerDialog.OnDateSetListener, int, int, int);










@@ -5292,6 +5298,7 @@ package android.app {













    method public void send(int, android.app.PendingIntent.OnFinished, android.os.Handler) throws android.app.PendingIntent.CanceledException;















    method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler) throws android.app.PendingIntent.CanceledException;















    method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler, java.lang.String) throws android.app.PendingIntent.CanceledException;













    method public void send(android.content.Context, int, android.content.Intent, android.app.PendingIntent.OnFinished, android.os.Handler, java.lang.String, android.os.Bundle) throws android.app.PendingIntent.CanceledException;















    method public static void writePendingIntentOrNullToParcel(android.app.PendingIntent, android.os.Parcel);















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















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










@@ -7966,10 +7973,12 @@ package android.content {













    method public abstract void revokeUriPermission(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);















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















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















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















    method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);













    method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);















    method public abstract void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);















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















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










@@ -8143,10 +8152,12 @@ package android.content {













    method public void revokeUriPermission(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);















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















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















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















    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);













    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);















    method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);















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















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










@@ -34026,10 +34037,12 @@ package android.test.mock {













    method public void revokeUriPermission(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);















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















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















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















    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);













    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);















    method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);















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















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

























cmds/am/src/com/android/commands/am/Am.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -1002,7 +1002,7 @@ public class Am extends BaseCommand {













        IntentReceiver receiver = new IntentReceiver();















        System.out.println("Broadcasting: " + intent);















        mAm.broadcastIntent(null, intent, null, receiver, 0, null, null, mReceiverPermission,













                android.app.AppOpsManager.OP_NONE, true, false, mUserId);













                android.app.AppOpsManager.OP_NONE, null, true, false, mUserId);















        receiver.waitForFinish();















    }


























@@ -1658,7 +1658,7 @@ public class Am extends BaseCommand {













        Intent intent = new Intent(















                "com.android.server.task.controllers.IdleController.ACTION_TRIGGER_IDLE");















        mAm.broadcastIntent(null, intent, null, null, 0, null, null, null,













                android.app.AppOpsManager.OP_NONE, true, false, UserHandle.USER_ALL);













                android.app.AppOpsManager.OP_NONE, null, true, false, UserHandle.USER_ALL);















    }































    private void runScreenCompat() throws Exception {

































cmds/pm/src/com/android/commands/pm/Pm.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1812,7 +1812,7 @@ public final class Pm {













        private IIntentSender.Stub mLocalSender = new IIntentSender.Stub() {















            @Override















            public int send(int code, Intent intent, String resolvedType,













                    IIntentReceiver finishedReceiver, String requiredPermission) {













                    IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) {















                try {















                    mResult.offer(intent, 5, TimeUnit.SECONDS);















                } catch (InterruptedException e) {

































core/java/android/app/ActivityManagerNative.java



+6
−4




























Original line number
Diff line number
Diff line








@@ -108,7 +108,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM













        try {















            getDefault().broadcastIntent(















                null, intent, null, null, Activity.RESULT_OK, null, null,













                null /*permission*/, appOp, false, true, userId);













                null /*permission*/, appOp, null, false, true, userId);















        } catch (RemoteException ex) {















        }















    }










@@ -458,12 +458,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM













            Bundle resultExtras = data.readBundle();















            String perm = data.readString();















            int appOp = data.readInt();













            Bundle options = data.readBundle();















            boolean serialized = data.readInt() != 0;















            boolean sticky = data.readInt() != 0;















            int userId = data.readInt();















            int res = broadcastIntent(app, intent, resolvedType, resultTo,















                    resultCode, resultData, resultExtras, perm, appOp,













                    serialized, sticky, userId);













                    options, serialized, sticky, userId);















            reply.writeNoException();















            reply.writeInt(res);















            return true;










@@ -2993,7 +2994,7 @@ class ActivityManagerProxy implements IActivityManager













    public int broadcastIntent(IApplicationThread caller,















            Intent intent, String resolvedType, IIntentReceiver resultTo,















            int resultCode, String resultData, Bundle map,













            String requiredPermission, int appOp, boolean serialized,













            String requiredPermission, int appOp, Bundle options, boolean serialized,















            boolean sticky, int userId) throws RemoteException















    {















        Parcel data = Parcel.obtain();









@@ -3008,6 +3009,7 @@ class ActivityManagerProxy implements IActivityManager













        data.writeBundle(map);















        data.writeString(requiredPermission);















        data.writeInt(appOp);













        data.writeBundle(options);















        data.writeInt(serialized ? 1 : 0);















        data.writeInt(sticky ? 1 : 0);















        data.writeInt(userId);