Hai Zhang
1839f9f7f8
Merge "Add myself to system server permission code OWNERS."
2020-10-07 05:31:10 +00:00
Paul Hu
bbab1d3b4f
Merge "Make PendingIntent immutable"
2020-10-07 03:53:30 +00:00
David Su
63549d1837
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours am: 79148d590a -s ours am: 3c8124a242 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621
Change-Id: I2e194f584a5dab5be0af93662ea2ee61572a41eb
2020-10-07 01:21:44 +00:00
wilsonshih
5d67607771
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98 am: 46bdd4af42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696
Change-Id: I387032e7d582bb08f4c241dd23dd1046b7338d05
2020-10-07 01:21:19 +00:00
wilsonshih
b180f6990a
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925
Change-Id: I3dde790cb91c34073396ff7c16e19ee55a59b74c
2020-10-07 01:21:09 +00:00
Automerger Merge Worker
3120bcd10d
Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev am: 2426f27569 am: 8a6fa4c1eb am: 75b7643622
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966
Change-Id: Ic863fe68f37cc7e03d4dbd81fd611cc68446f7fd
2020-10-07 01:20:55 +00:00
Nathan Harold
96631660af
[automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours
...
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: Id0c890f9d9f00c7b00164fe3ac4f4d1799ad00ee
2020-10-07 01:19:56 +00:00
Nathan Harold
d76e095bc3
[automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours am: d5bb499052 -s ours
...
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: I605e9b72eb6a090fa40aea83fc885d8590808a44
2020-10-07 01:19:54 +00:00
David Su
60cf3eebd5
Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: Ic35e179d67e2804f71d53489101d1c6efc05f156
2020-10-07 01:03:33 +00:00
David Su
3c8124a242
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours am: 79148d590a -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621
Change-Id: Ida2be85706ade89a4db9db7db97c8a027f47c05e
2020-10-07 00:38:21 +00:00
wilsonshih
46bdd4af42
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17 am: c201373d98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696
Change-Id: I648c5523d1895dd93a49e39431894d504ea74e2b
2020-10-07 00:37:53 +00:00
wilsonshih
254924da94
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925
Change-Id: I5cae667d955f7cf02180d1a30ee8cbff976f5bfb
2020-10-07 00:37:43 +00:00
Automerger Merge Worker
75b7643622
Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev am: 2426f27569 am: 8a6fa4c1eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966
Change-Id: I42f66a255836d5b92476484054756baad67de7b5
2020-10-07 00:37:28 +00:00
Nathan Harold
94e5401f7e
[automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: I90b8806dfa4bf3b4717c1ecb50661487a9590717
2020-10-07 00:36:45 +00:00
Nathan Harold
d5bb499052
[automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849 am: e1a23c7ef6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: I6fb22f36f2615f337699817083991ba741a3938e
2020-10-07 00:36:38 +00:00
David Su
d1bcf628bd
Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev
2020-10-07 00:04:30 +00:00
Hai Zhang
4e17c9292a
Add myself to system server permission code OWNERS.
...
Test: presubmit
Change-Id: I19a532d54f8126adfae2b3ab50e5b138a90f8c8b
2020-10-07 00:03:33 +00:00
David Su
79148d590a
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621
Change-Id: Iafd009c9fb724e499a10a071fddec997a322de76
2020-10-06 23:37:16 +00:00
David Su
b9edc63f80
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621
Change-Id: I375dcd7dd68d2cf8acb61024de119fc741c4124d
2020-10-06 23:20:52 +00:00
David Su
8a936e088d
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621
Change-Id: I262bad1ed18fccf08bc40de1878fb5c6785ebad3
2020-10-06 22:41:13 +00:00
David Su
3d92e370f5
Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev
2020-10-06 21:57:10 +00:00
Tyler Gunn
434fc2c524
Clarify API docs for getCannedTextResponses.
...
The API docs do not clearly indicate the fact that canned text responses
may not be available when a call is first added. Updating the API docs
to clarify this and reference the listener a developer can use to be
informed of changes to the canned responses.
Test: Docs only change.
Bug: 162843384
Change-Id: I52ced96439b2dfa31c1f2428979ab54466763afa
2020-10-06 14:23:54 -07:00
Xin Li
e5176d3141
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 85e07ab8bb -s ours am: 60207dea5d -s ours
...
am skip reason: Change-Id Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb with SHA-1 1315f1105e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450086
Change-Id: If52b26f3960edac6e4849339b2bcb8e4a1b9dad8
2020-10-06 21:15:41 +00:00
Treehugger Robot
fb0444e82c
Merge "Expose getSmsCapacityOnIcc()" am: 4d96662b1f am: bb2a513010
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1293900
Change-Id: I2b7d699b841d97a044d5f6c6276055d706238212
2020-10-06 20:54:54 +00:00
Steven Moreland
9555aa4dd5
Merge "HIDL: unsilence error for local Java binder" am: d806764162 am: bedff86e1a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445875
Change-Id: Id93fc8916d2ff4ebacf927c80851f1d26d7a154e
2020-10-06 20:53:31 +00:00
Xin Li
60207dea5d
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 85e07ab8bb -s ours
...
am skip reason: Change-Id Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb with SHA-1 0a012afd4a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450086
Change-Id: I440e9559f0ac14f48c6d672bdf44992f8db8d82f
2020-10-06 20:23:54 +00:00
Xin Li
85e07ab8bb
Merge "DO NOT MERGE - Merge RP1A.201005.006"
2020-10-06 20:17:27 +00:00
Treehugger Robot
bb2a513010
Merge "Expose getSmsCapacityOnIcc()" am: 4d96662b1f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1293900
Change-Id: I0085abc3b4513bb0a8f6b5ab6bace92a8f578458
2020-10-06 20:17:06 +00:00
Treehugger Robot
4d96662b1f
Merge "Expose getSmsCapacityOnIcc()"
2020-10-06 20:12:05 +00:00
Steven Moreland
bedff86e1a
Merge "HIDL: unsilence error for local Java binder" am: d806764162
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1445875
Change-Id: I748df2b8c1784dd22b6d5a7655d35562e9ca7ca8
2020-10-06 20:10:38 +00:00
wilsonshih
c201373d98
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946 am: 7e24456d17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696
Change-Id: Ie492357129e045d664ece96ee032f78d43594175
2020-10-06 19:56:38 +00:00
Steven Moreland
d806764162
Merge "HIDL: unsilence error for local Java binder"
2020-10-06 19:38:50 +00:00
wilsonshih
7e24456d17
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4 am: 7e53b78946
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696
Change-Id: I15107c6c6780c642467d8fa47c0a0b6f7dec95be
2020-10-06 19:23:48 +00:00
wilsonshih
7e53b78946
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6 am: 286aa8b9b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696
Change-Id: I458eff483892bb657dffa854c56a25ab694e38ac
2020-10-06 18:33:59 +00:00
Taesu Lee
a248f3586f
Expose getSmsCapacityOnIcc()
...
Unhide getSmsCapacityOnIcc() and it requires READ_PHONE_STATE instead.
Bug: 154878196
Test: Manual
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
Merged-in: I86ba39d5073227ff55251fabc614fd3b9347285e
Change-Id: I86ba39d5073227ff55251fabc614fd3b9347285e
2020-10-06 18:13:58 +00:00
wilsonshih
b3fd083cb1
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925
Change-Id: I6749ecdc5cc0d355d27385326f81749d2ebfbac4
2020-10-06 17:53:37 +00:00
Automerger Merge Worker
8a6fa4c1eb
Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev am: 2426f27569
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966
Change-Id: Ifc2fb9150cfa823cb2aefd604a3ef2b2d0e5e8d3
2020-10-06 17:53:30 +00:00
Chris Tate
d18824ca39
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e am: b7c896bef2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027
Change-Id: I87274ba204aaa1800644505636dff5415faf02b9
2020-10-06 17:44:37 +00:00
Chris Tate
a9e50438aa
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8 am: 67c0cd04bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923
Change-Id: I6ed5d7d652d73ad01f5213500c5dac71dca8389c
2020-10-06 17:44:24 +00:00
Nathan Harold
9a34dd689c
Merge "[BACKPORT] Improve location checks in TelephonyRegistry" into rvc-dev am: 21a1916717 am: c96eba62ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11589690
Change-Id: I6f2f6ce14f2aa62f3b0034b19852426b53239d96
2020-10-06 17:44:09 +00:00
wilsonshih
286aa8b9b4
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b392903052 am: f75396d3c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696
Change-Id: I1892ed87e6727905e30cec3d0eb6bbba53656ca6
2020-10-06 17:43:31 +00:00
wilsonshih
5b295c7726
Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925
Change-Id: I6d3b4ea454c5cdc21eb681ede76387f46b9fdb43
2020-10-06 17:09:16 +00:00
Automerger Merge Worker
2426f27569
Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90" into qt-dev
2020-10-06 17:08:55 +00:00
Chris Tate
8a088693f9
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966
Change-Id: If41066d2389e949e605d926b85b9683b4ed4f467
2020-10-06 17:07:58 +00:00
Chris Tate
b7c896bef2
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866 am: 676b35b98e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027
Change-Id: I23cc0faca6b672caea0e3a9a2c5c1d244b22e58e
2020-10-06 17:01:25 +00:00
Chris Tate
67c0cd04bf
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-qpr1-dev am: 985f7b1d53 am: 815ca2d7d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715923
Change-Id: Iab51ff4dddfb51fcc6f9c4a974751df0c307b1ca
2020-10-06 17:01:08 +00:00
Nathan Harold
e45ec287ed
Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: If8b87dc5468c0f0d9c0fd93df2c116f08e080349
2020-10-06 16:58:46 +00:00
Nathan Harold
e1a23c7ef6
[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b849
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: Ia7eefa1ef81a76c64cf14928bf12b40847d4b52a
2020-10-06 16:58:32 +00:00
Chris Tate
676b35b98e
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into qt-dev am: e174ab0148 am: 02513e4866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12719027
Change-Id: I186d804f3c47caa6b879f5b60713b7adf1ddf2e3
2020-10-06 16:58:25 +00:00
Tyler Gunn
7b4ee3d58f
Merge "Make android.telecom.action.POST_CALL a protected broadcast." am: 2046a9dced am: 0c1a841122
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446777
Change-Id: I6e6282829bcb4c3a637a5e1a4bbc2a12644a33d2
2020-10-06 16:57:17 +00:00