Jeffrey Huang
1ea7ebd61d
Increase event queue limit to 4000
...
Bug: 169089731
Test: m -j
Change-Id: I9fb8707a5eb190b5749af84e3eb65567b87439bc
Merged-In: I9fb8707a5eb190b5749af84e3eb65567b87439bc
(cherry picked from commit 29edf77b15 )
2020-10-09 17:39:30 +00:00
Chen Xu
51571f8993
Merge "area info update improvement" into mainline-prod
2020-10-08 17:50:15 +00:00
TreeHugger Robot
ffb4f52167
Merge "Do not re-initialize synthetic password" into rvc-dev am: 5ad4ec37a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12653063
Change-Id: Ie7c727d71e0d4032f74dfc87df02f9c3d89cb7af
2020-10-08 10:55:15 +00:00
TreeHugger Robot
5ad4ec37a0
Merge "Do not re-initialize synthetic password" into rvc-dev
2020-10-08 10:37:53 +00:00
TreeHugger Robot
a50be49dd4
Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c am: f1c038465d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135
Change-Id: I33bc6c6b1c1ce5adffe1ef7ad84d18833d996240
2020-10-08 05:36:39 +00:00
TreeHugger Robot
f1c038465d
Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135
Change-Id: I0b180698048fb1c643d90f2d038d1df8d66fc671
2020-10-08 05:05:38 +00:00
TreeHugger Robot
e7069bce3c
Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135
Change-Id: Ic730c4d98a309aadcde740d77582ffb7d788337f
2020-10-08 04:54:24 +00:00
TreeHugger Robot
d29dc3d991
Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135
Change-Id: Id5bfe41bdf8ce53c5da5e9d6322abf7f9df46837
2020-10-08 04:27:35 +00:00
Mark Chien
741959e1eb
Merge "Remove double check interface by NetworkInterface" into mainline-prod
2020-10-08 04:17:59 +00:00
Mark Chien
19d19662f3
Merge "Fix TetheredClient callback fail in InProcessTethering" into mainline-prod
2020-10-08 04:17:35 +00:00
TreeHugger Robot
a2a586a61a
Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135
Change-Id: I52b4099eca7e8c8069b7fd7446784aae1a0569bc
2020-10-08 04:10:10 +00:00
TreeHugger Robot
83739b6db9
Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev
2020-10-08 03:40:59 +00:00
David Su
dbd9ded17e
[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours am: 3ea188d4d2 -s ours am: 81373b0b89 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618
Change-Id: I925e034e8140177ad0d3bfd1d30ced9f6ca10c9b
2020-10-08 02:35:58 +00:00
David Su
81373b0b89
[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours am: 3ea188d4d2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618
Change-Id: Iff6123ae0567a9066158c2c4b7a07ec3508e1bd7
2020-10-08 02:13:39 +00:00
David Su
3ea188d4d2
[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618
Change-Id: I85309b43227c6fcbea1310281ccf7b42981bf1ca
2020-10-08 01:46:19 +00:00
David Su
3b9f0fb6c3
[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618
Change-Id: I6c39f346377c9f591d4207b3c2288344470276e6
2020-10-08 01:25:05 +00:00
David Su
88ec485f39
[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618
Change-Id: I36bdfb8c03950173e51ea9815a6fda619126aff8
2020-10-08 00:53:06 +00:00
David Su
d840f0c7da
[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618
Change-Id: Idefd4af0be5dce2baf988135f3062029749dc95b
2020-10-08 00:24:07 +00:00
David Su
816fd66d64
[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618
Change-Id: I19aeca326d6f4faae382fb6a140acde81602eb3a
2020-10-08 00:11:38 +00:00
Chen Xu
8c4983fd63
area info update improvement
...
when users disable areaInfo toggle from CBR, clear areaInfos and
notify listeners that area info updated so that settings and systemUI
could refresh the UI instead of showing outdated area info.
Bug: 162475765
Test: Manual
Change-Id: I8c2b29750817a71165adff3ee64c96249e9d7380
2020-10-07 21:28:50 +00:00
Treehugger Robot
aaeaa420c2
Fix TetheredClient callback fail in InProcessTethering
...
TetheredClient callback would additional check whether caller has
NETWORK_SETTINGS or {MAINLINE_}NETWORK_STACK permission, but it do not
grant for self accessing. InProcessTethering run in system server, so
the services in system server would fail to call TetheredClient callback.
Grant permission for self process.
Bug: 169231588
Test: atest CtsTetheringTest
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273
Change-Id: I8faacd26cc6f3e940af3a0147b84b693cb93503c
Merged-In: Ic04e44aef4df772c718ff25ed331bf02f5940c1d
(cherry picked from commit 4ac111af72 )
2020-10-07 17:46:29 +00:00
Treehugger Robot
3ec0bfd1ea
Remove double check interface by NetworkInterface
...
NetworkInterface#getByName can not get the interface without IP addresses.
When setIncludeTestInterfaces(true) is called, the interface will be
placed in client mode, which will delete the link-local address. So calling
NetworkInterface#getByName to get test interface may not work before
switching to server mode.
Bug: 168215721
Test: atest CtsTethering
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032
Change-Id: Idf1d18261c954e22989774ae97a12261551b31f6
Merged-In: Ice8adcce1c4b2c86bd219c701b2afa9ba2339f24
(cherry picked from commit ab364519ad )
2020-10-07 17:44:55 +00:00
David Su
752cb249a6
RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext.
...
sendBroadcastAsUserMultiplePermissions was added to Context.java.
Implementing in BridgeContext.
Fix oc-dev since BridgeContext is in frameworks/base/tools/layoutlib,
whereas in later branches the file is in frameworks/layoutlib
Test: Compile / build (actual usage is documented in other bugs)
Bug: 159373687
Change-Id: I8715b6fce7039268eb29914cb15f68ab922f4d3f
Merged-In: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
2020-10-07 14:41:24 +00:00
David Su
9aa9ebde67
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: Ic2f1047facd19ae8f7da52668705022e6ac9406a
2020-10-07 09:34:59 +00:00
David Su
008d947b59
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: If5edb76ce859af8506a381856c6b3b0058aee541
2020-10-07 09:18:41 +00:00
David Su
4c94806e28
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: Id637abc5705e488e2bc77122e052b9d3ea475ae3
2020-10-07 08:32:52 +00:00
David Su
5c2b86fbed
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: Ic97189261040a3eef447064ceed038727fb11120
2020-10-07 08:16:39 +00:00
David Su
aeac5e7d30
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: I7bedb3b7b8da1bdbe3f483b5186d7864ffc22f7a
2020-10-07 07:58:20 +00:00
David Su
615d6b6ba6
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours
...
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: If0bd01e56bc171cf50e01443bdac78bc149dd64b
2020-10-07 07:44:33 +00:00
David Su
ed654d8291
[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: I768e03c233252a6ce4b8df7bd63592f566a783e4
2020-10-07 01:21:50 +00:00
wilsonshih
e856d08ea0
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: Ia6866b06372b5b49f679a69af78aaa5f014a11bf
2020-10-07 01:21:26 +00:00
Automerger Merge Worker
b80c8788c1
Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54fc9 am: 6ea3559233 am: 5b295c7726 am: b3fd083cb1 am: 254924da94" into mainline-prod
2020-10-07 01:21:18 +00:00
wilsonshih
3ba9325499
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: I53ea91c7ca87fc04931e12e5bf12aa6bf096619d
2020-10-07 01:21:09 +00:00
wilsonshih
1100e865c4
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: Id71551d7ed1c5503dadd39a4e866d637b4942735
2020-10-07 01:20:49 +00:00
Automerger Merge Worker
690a1c2960
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: I0c3392d430cab51f285c4a21b9891c0e7cc59c4f
2020-10-07 01:20:39 +00:00
Nathan Harold
e3a7930b6c
[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: I7e309842021ec6e94c5788d4b068d0f87cbad12c
2020-10-07 01:20:05 +00:00
Nathan Harold
9a90eb084b
[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: Ib1476008299331c9890acc09ed6501a2840f7d04
2020-10-07 01:20:03 +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
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
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