Rambo Wang
a23b16281b
[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a am: 597690dc7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226
Change-Id: I37777f520f99d2b9f285edaf5011c07470614943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:25:28 +00:00
TreeHugger Robot
f7ff200a1c
Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d am: c0477b594d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954
Change-Id: I9b98c3db4d91a9b6e7167d5f4f979424f6f69216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:24:49 +00:00
Rambo Wang
597690dc7f
[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18497226
Change-Id: I658fe767e8d97dd12c761182937c45b4fd7169b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:24:22 +00:00
Calvin Pan
cdcc0c0fa4
Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57 am: 3b35df974a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917
Change-Id: Ic681b525f55ba1ab595d88f2fc569dc08dfa6c8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:24:09 +00:00
TreeHugger Robot
c0477b594d
Merge "Adjust LogAccessDialog themeing for TV" into tm-dev am: 24928c481d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907954
Change-Id: Idb14d285578705e5c6dbf228df23438a44e669dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:23:54 +00:00
Arc Wang
9fc3ff453a
Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8 am: c58e951066
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945
Change-Id: I5dae58801800b9d6ffb1a76098792ed0930a7c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:23:21 +00:00
Calvin Pan
3b35df974a
Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev am: cdcff91c57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18452917
Change-Id: Ia7718f03133f127e1f62c23afe3a3d4a66188a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:22:27 +00:00
TreeHugger Robot
d8f6763ccb
Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f am: 1c458d3522
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155
Change-Id: I77c0cfd7ae5ffb211c83395fb0f6c488a0b2eb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:22:23 +00:00
Arc Wang
c58e951066
Merge "Change ripple color for Spinner" into tm-dev am: 20efd509d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482945
Change-Id: Ic2f6e6a4914a06e70b468a7a50741568820eefae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:22:01 +00:00
Issei Suzuki
90bd32910b
Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-d1-dev am: a198a65234
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18436742
Change-Id: I62199369897dd1fad6340721cc3b5bb6318b7e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:21:28 +00:00
Michael Groover
20adc38129
Merge "Revert "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6 am: 8aa6d20125""" into tm-d1-dev am: c2da54f24e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18409337
Change-Id: I6ada76abe7ef1f93105f79a861792228f5a0163d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:19:05 +00:00
TreeHugger Robot
1c458d3522
Merge "Launch app intent after unlock" into tm-dev am: ff1ae8716f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18455155
Change-Id: I0689832d136f55fa9a127754d8c6645d02332e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 12:19:02 +00:00
Issei Suzuki
a198a65234
Merge "Add ActivityOption to remove keyguard when an activity is launched." into tm-d1-dev
2022-05-20 07:29:31 +00:00
TreeHugger Robot
24928c481d
Merge "Adjust LogAccessDialog themeing for TV" into tm-dev
2022-05-20 03:17:24 +00:00
Calvin Pan
cdcff91c57
Merge "Avoid printing call stack for the app that doesn't add the LocaleConfig" into tm-dev
2022-05-20 01:52:46 +00:00
Arc Wang
20efd509d8
Merge "Change ripple color for Spinner" into tm-dev
2022-05-20 01:23:24 +00:00
Michael Groover
c2da54f24e
Merge "Revert "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am: a347b6c2e6 am: 8aa6d20125""" into tm-d1-dev
2022-05-20 01:03:34 +00:00
TreeHugger Robot
ff1ae8716f
Merge "Launch app intent after unlock" into tm-dev
2022-05-20 01:02:45 +00:00
Robert Wu
d43a8db0f2
Merge "USB MIDI: Use Thread.interrupt() to close threads" into tm-dev am: 5596184a23 am: 63424001d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18460398
Change-Id: Idcebaf947bb1aad4b50819f310d54691273611a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 00:12:22 +00:00
Robert Wu
d2d6c93957
Merge "USB MIDI: Use Thread.interrupt() to close threads" into tm-dev am: 5596184a23 am: f8f5a5b12d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18460398
Change-Id: Iaa5261cc7d642b64485cc95850183096cf62f491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-20 00:02:26 +00:00
Robert Wu
63424001d1
Merge "USB MIDI: Use Thread.interrupt() to close threads" into tm-dev am: 5596184a23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18460398
Change-Id: I2a6c23902943c3c425b999f77d254f8fa504c6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 23:46:17 +00:00
Robert Wu
f8f5a5b12d
Merge "USB MIDI: Use Thread.interrupt() to close threads" into tm-dev am: 5596184a23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18460398
Change-Id: I23cb3a57948a1bd40f9e0c6d2df9fb06878ec725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 23:45:24 +00:00
Robert Wu
5596184a23
Merge "USB MIDI: Use Thread.interrupt() to close threads" into tm-dev
2022-05-19 23:02:19 +00:00
Rambo Wang
3a8a004d2a
[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"
...
This reverts commit fb4a590dbc .
This change brings back the grace period built in VCN because
the carrier privileges grace period is turn off.
Bug: 229418673
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: I85738c969c2bf78da33beaebe5863432948b7735
2022-05-19 22:58:29 +00:00
Automerger Merge Worker
7ffb87e670
Merge "Merge "Improve SearchView & secondary text accessibility" into tm-dev am: 9df49914b1 am: eb3241f54f" into tm-d1-dev-plus-aosp
2022-05-19 22:34:52 +00:00
Alexandre Elias
7e355498fc
Merge "Improve SearchView & secondary text accessibility" into tm-dev am: 9df49914b1 am: eb3241f54f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418642
Change-Id: If88470220097fa6f91a3a1f5a72d5c88e02bd697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:34:40 +00:00
Alexandre Elias
e33a29fef8
Merge "Improve SearchView & secondary text accessibility" into tm-dev am: 9df49914b1 am: 88f317ab02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418642
Change-Id: Ifbdfe1bc183ba95f73c5dc829217d61c99aa6157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:34:31 +00:00
Automerger Merge Worker
09b1af0595
Merge "Merge "Update sync exemptions log to include restriction level." into tm-dev am: 2b4f92c65a am: 865f3c014e" into tm-d1-dev-plus-aosp
2022-05-19 22:34:01 +00:00
TreeHugger Robot
3b5b5367ee
Merge "Update sync exemptions log to include restriction level." into tm-dev am: 2b4f92c65a am: fbb5830959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18438448
Change-Id: I619b9ac0f98d7ce345f395336e41441086e14759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:33:44 +00:00
TreeHugger Robot
8fdb4f9cd6
Merge "Update sync exemptions log to include restriction level." into tm-dev am: 2b4f92c65a am: 865f3c014e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18438448
Change-Id: I553da86e8bafce1d1b0f2da22b082c20cf7c20e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:33:44 +00:00
Alexandre Elias
88f317ab02
Merge "Improve SearchView & secondary text accessibility" into tm-dev am: 9df49914b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418642
Change-Id: I0681f5874e18b7dc941584f622d30c47afca92ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:22:15 +00:00
Alexandre Elias
eb3241f54f
Merge "Improve SearchView & secondary text accessibility" into tm-dev am: 9df49914b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18418642
Change-Id: I5e4dc802639d3743d64ef1aada8cfe486d0dedd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:16:07 +00:00
TreeHugger Robot
865f3c014e
Merge "Update sync exemptions log to include restriction level." into tm-dev am: 2b4f92c65a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18438448
Change-Id: Iea1304519120343e713c57bfcd1bfa3b07a81d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:15:43 +00:00
Alexandre Elias
9df49914b1
Merge "Improve SearchView & secondary text accessibility" into tm-dev
2022-05-19 22:15:01 +00:00
TreeHugger Robot
fbb5830959
Merge "Update sync exemptions log to include restriction level." into tm-dev am: 2b4f92c65a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18438448
Change-Id: Ife3c568f1d18dfcb34e34b55489802025e21294d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 22:14:11 +00:00
TreeHugger Robot
2b4f92c65a
Merge "Update sync exemptions log to include restriction level." into tm-dev
2022-05-19 21:57:47 +00:00
TreeHugger Robot
88647406f3
Merge "Fix notifications accepting touches outside their bounds" into tm-dev am: 0a9cb9b46d am: ea8e9ceb46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18456315
Change-Id: I79714df2bcc3e12e3f049a22ca017cd28ea834b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 20:47:52 +00:00
TreeHugger Robot
9b30627ae8
Merge "Fix notifications accepting touches outside their bounds" into tm-dev am: 0a9cb9b46d am: 38615a5ac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18456315
Change-Id: I92b239e48929be8d21930b380bebd6a185465160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 20:45:26 +00:00
TreeHugger Robot
38615a5ac2
Merge "Fix notifications accepting touches outside their bounds" into tm-dev am: 0a9cb9b46d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18456315
Change-Id: If41365a1463b6f281a5d0ec1b884f744737b49f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 19:30:46 +00:00
TreeHugger Robot
ea8e9ceb46
Merge "Fix notifications accepting touches outside their bounds" into tm-dev am: 0a9cb9b46d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18456315
Change-Id: I76e72cb7b6b48e6746168ea7b217b98083220abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 19:28:59 +00:00
TreeHugger Robot
0a9cb9b46d
Merge "Fix notifications accepting touches outside their bounds" into tm-dev
2022-05-19 18:55:50 +00:00
Automerger Merge Worker
63fa749259
Merge "Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d30 am: 5e40d2efd9" into tm-d1-dev-plus-aosp
2022-05-19 17:44:42 +00:00
Amith Yamasani
e45c05fbda
Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d30 am: 5e40d2efd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282431
Change-Id: Ia84f17898ecb1ad28e17da6735975118973c53b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 17:44:20 +00:00
Amith Yamasani
e4b05a453a
Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d30 am: 3fd4083940
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282431
Change-Id: I0f3dc24c38ef65e40e7164d833de071cdab54342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 17:44:14 +00:00
Amith Yamasani
5e40d2efd9
Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282431
Change-Id: I8ba6027190c51298e7b1be47b536a789bf9df625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 17:16:05 +00:00
Amith Yamasani
3fd4083940
Merge "Sanitize Uri.toSafeString() some more." into tm-dev am: b6da699d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282431
Change-Id: If4e7b6c80d0107699f1ef897f9202e510c796dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 17:14:44 +00:00
Amith Yamasani
b6da699d30
Merge "Sanitize Uri.toSafeString() some more." into tm-dev
2022-05-19 16:53:29 +00:00
TreeHugger Robot
acfa1e36d2
Merge "Distinguish process-switch for launch trace" into tm-dev am: 8890d47366 am: 65eab98b58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18451948
Change-Id: Idccb1ce359f584512c841d7283020b925203d985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 16:24:20 +00:00
TreeHugger Robot
29358b445d
Merge "Distinguish process-switch for launch trace" into tm-dev am: 8890d47366 am: d8b5b70044
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18451948
Change-Id: Ia7e502459ba0ef1866f1201b2b31243e65620b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 16:24:01 +00:00
Robert Wu
6cd937c488
USB MIDI: Use Thread.interrupt() to close threads
...
We start input threads before setting mIsOpen.
This means that sometimes, input threads immediately exit
due to a race condition.
The fix here is to remove the use of mIsOpen and use a new
mechanism with Thread.interrupt() and Thread.interrupted()
to mark a thread to be closed.
Bug: 223316278
Test: MidiScope/MidiKeyboard
Test: CTS Verifier Bluetooth Tests
Change-Id: I7c221504ae8a8814c1aa5598552494c80c202eb2
2022-05-19 16:01:52 +00:00