Commit Graph

702592 Commits

Author SHA1 Message Date
TreeHugger Robot
58a70958aa Merge "Remove LOCATION_HARDWARE from ContextHubManager/Client APIs" 2021-07-20 01:30:51 +00:00
Rambo Wang
4b4d185103 Merge "Clear binder identity in callback of IMS IPC interfaces" am: 67e10842b2 am: 3d97b23aa1 am: e5026e2532 am: 34856c5f96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771685

Change-Id: Iaa3d4b92499470cc7a3895f9f580cb5bdcaf1f1b
2021-07-20 01:21:55 +00:00
TreeHugger Robot
61f482f9fd Merge "Move SetupLocaleProperties to Settings.Global." 2021-07-20 01:19:39 +00:00
Rambo Wang
34856c5f96 Merge "Clear binder identity in callback of IMS IPC interfaces" am: 67e10842b2 am: 3d97b23aa1 am: e5026e2532
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771685

Change-Id: I3d2a499fcfd72c61605ba345b0b576ea7896370f
2021-07-20 01:02:06 +00:00
Automerger Merge Worker
08636b3e94 Merge "[automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 am: 697483e16f -s ours" into sc-v2-dev-plus-aosp am: cd9035dd9f -s ours
am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 f9fdfa9751 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: Ie59bae563167602f5d2458c518f4d9af6be878a9
2021-07-20 00:52:58 +00:00
Winson Chung
5b41ece5fb [automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 -s ours am: 3371d7c394 -s ours am: 7146b45eb9 -s ours
am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 ac42fd0bf9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: Ib075291cf45cc3d8a6a6f0db3366441b2cf34eeb
2021-07-20 00:51:54 +00:00
Rambo Wang
e5026e2532 Merge "Clear binder identity in callback of IMS IPC interfaces" am: 67e10842b2 am: 3d97b23aa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771685

Change-Id: I86ad5e1d544870b5fb5b450664d57e39699f7d3d
2021-07-20 00:44:43 +00:00
Automerger Merge Worker
cd9035dd9f Merge "[automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 am: 697483e16f -s ours" into sc-v2-dev-plus-aosp 2021-07-20 00:35:41 +00:00
Winson Chung
1677b8ea51 [automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 am: 697483e16f -s ours
am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 ac42fd0bf9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: Ia8294dbd614481f9c5a24cd76dc9cda07fc7ea93
2021-07-20 00:35:31 +00:00
Winson Chung
7146b45eb9 [automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 -s ours am: 3371d7c394 -s ours
am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 ac42fd0bf9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: I5b3b631729c98a0d61cf76377472e8f410e9f9a7
2021-07-20 00:35:27 +00:00
Rambo Wang
3d97b23aa1 Merge "Clear binder identity in callback of IMS IPC interfaces" am: 67e10842b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771685

Change-Id: I80edbe7adc7d6b4eae5ba77e05656f130888d0dc
2021-07-20 00:31:49 +00:00
Winson Chung
ea3542d6fd [automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 am: d29d19d272 -s ours
am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 ac42fd0bf9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: I4edf9d8a43df5fa915583ab0663c5eccbabf6d7c
2021-07-20 00:30:38 +00:00
Winson Chung
697483e16f Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: Ie1e6546b22174f680af8996cf98057251d6ab690
2021-07-20 00:23:01 +00:00
Winson Chung
3371d7c394 [automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 -s ours
am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 ac42fd0bf9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: I3c06d274b808684e601c8eebc387bdb609759a5c
2021-07-20 00:22:25 +00:00
Winson Chung
d29d19d272 Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986

Change-Id: I23bf39d5d5bda2917454df0cd9fb52d38c27edf9
2021-07-20 00:20:10 +00:00
Rambo Wang
67e10842b2 Merge "Clear binder identity in callback of IMS IPC interfaces" 2021-07-20 00:18:40 +00:00
TreeHugger Robot
9a405de924 Merge "Fix to call openGutsInternal even when no Statusbar exists" into sc-v2-dev am: 3296cc24eb am: da095b8e19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320516

Change-Id: I12ec8f89d2498c2bc9935acbd0e8aaa76d1c98d2
2021-07-20 00:13:53 +00:00
Winson Chung
72922c8a85 Merge "Add null check to work around async unregistration of receiver" into sc-dev 2021-07-20 00:05:56 +00:00
TreeHugger Robot
da095b8e19 Merge "Fix to call openGutsInternal even when no Statusbar exists" into sc-v2-dev am: 3296cc24eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320516

Change-Id: I112c03b7a884030020917a7450b4a17cb1c262d3
2021-07-20 00:03:23 +00:00
Vishnu Nair
659cfbebcb Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1 am: 9fd93a4133 am: 37aec8764a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: I99084c233e58551621d1af30e98c561013b7ee4c
2021-07-19 23:55:42 +00:00
Arthur Ishiguro
bef1b62ac0 Remove LOCATION_HARDWARE from ContextHubManager/Client APIs
Fixes: 191483162
Test: Run PTS tests on existing CHRE devices
Test: Flash on device, verify no security exception is observed
Change-Id: I405423c0981ae2618faa35fd2df9c068d6ead94a
2021-07-19 23:55:37 +00:00
Vishnu Nair
7392280255 Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1 am: 23d898fb78 am: c681d7fdfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: I557546a8f2d4529da121f3e43e83c0372b6e9984
2021-07-19 23:55:18 +00:00
TreeHugger Robot
3296cc24eb Merge "Fix to call openGutsInternal even when no Statusbar exists" into sc-v2-dev 2021-07-19 23:49:57 +00:00
Vishnu Nair
37aec8764a Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1 am: 9fd93a4133
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: I52bce81a023f9d70afae992cd6b5a666c47873b2
2021-07-19 23:42:49 +00:00
Vishnu Nair
30615e1c4c Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1 am: ae457baeff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: Ia6065183f8bed1fb3a5ffae0b2af9569c1adf48d
2021-07-19 23:42:26 +00:00
Vishnu Nair
c681d7fdfe Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1 am: 23d898fb78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: Id5eada4be69cf8c5597b99a58a811c172ac3db7d
2021-07-19 23:38:29 +00:00
Automerger Merge Worker
fdbba07e29 Merge "Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85 am: e8021fb567" into sc-v2-dev-plus-aosp am: 148dd1bd0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: Id55cbca05f2dcecddb4e60f0c842bf54420e24b5
2021-07-19 23:34:51 +00:00
Shuo Qian
1c15dc036e Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85 am: b4fe9c3215 am: 5cf584ec4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: I6e6540e6893d1c7b5076422128e67f860333ee55
2021-07-19 23:34:22 +00:00
Vishnu Nair
9fd93a4133 Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: I48261545315b21c41a5c6802f7870e3a946d88ef
2021-07-19 23:29:28 +00:00
Vishnu Nair
ae457baeff Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: I32755b9750b1c8f5b64c0f125a5f977f3f331af0
2021-07-19 23:28:49 +00:00
Vishnu Nair
23d898fb78 Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev am: 861ba140a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302836

Change-Id: I2da67d02274e3eb5ce96978c9820f97963a732a0
2021-07-19 23:28:14 +00:00
Josh Yang
8e7006c48b Move SetupLocaleProperties to Settings.Global.
Bug: 173818444
Test: manual test
Change-Id: Icda9c489534849a2f59e93195f9a6ded377d38b1
(cherry picked from commit 61a67de48545d27e7e8d10a19cc07d2cc8b86dea)
2021-07-19 23:24:08 +00:00
Automerger Merge Worker
148dd1bd0c Merge "Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85 am: e8021fb567" into sc-v2-dev-plus-aosp 2021-07-19 23:20:40 +00:00
Shuo Qian
b4b33a2bf1 Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85 am: e8021fb567
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: I9f8438edd0b1170664aadaa50d9b68937b7c9681
2021-07-19 23:20:37 +00:00
Shuo Qian
5cf584ec4f Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85 am: b4fe9c3215
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: Icb6e8c7bfaff22063a2f1cf04eb57afd991fe35e
2021-07-19 23:20:27 +00:00
Shuo Qian
9c1f2087f5 Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85 am: 513b4646d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: Iff3824c2a57be8377691215a3342d4a09182b1c4
2021-07-19 23:20:00 +00:00
Vishnu Nair
861ba140a1 Merge "SurfaceView: Update transform hint only if the view is visible" into sc-dev 2021-07-19 23:17:07 +00:00
TreeHugger Robot
1f862b0ac0 Merge "Expose ADAS APIs" 2021-07-19 23:08:10 +00:00
Shuo Qian
b4fe9c3215 Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: I716316c0fbdeda78482ac4140b2494d351cbea2a
2021-07-19 23:08:00 +00:00
Shuo Qian
e8021fb567 Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: I1341b9b3e8dcf09cfec276752ec57a4858f01c17
2021-07-19 23:07:36 +00:00
Shuo Qian
513b4646d3 Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301694

Change-Id: I7e1205b9ba23266154abd0a51ed648daead73672
2021-07-19 23:07:18 +00:00
Shuo Qian
ba314fbb85 Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev 2021-07-19 22:53:32 +00:00
TreeHugger Robot
8729fa2472 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660 am: 91e7f7ffd7 am: 793e3131d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: I8692fb0c84a946e2e5de00da84a1f8874a0df391
2021-07-19 22:26:00 +00:00
TreeHugger Robot
793e3131d4 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660 am: 91e7f7ffd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: I70c0fbf0cef618ba9bd821e04afb48f456ac1c2c
2021-07-19 22:25:32 +00:00
TreeHugger Robot
fd3ba49536 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660 am: fbb8676b2b am: c2bfc712dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: I8cfcd158a18d662a0642c780cfc701440a22ed5e
2021-07-19 22:25:24 +00:00
TreeHugger Robot
c2bfc712dd Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660 am: fbb8676b2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: I5f1b8784443603e6dc13aaea40005d9ce546ca2e
2021-07-19 22:16:29 +00:00
TreeHugger Robot
ad333619f6 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660 am: 62c2c75c41
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: I05f1654c7e291018c59e56eab302697f6cfe7095
2021-07-19 22:15:34 +00:00
TreeHugger Robot
91e7f7ffd7 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: Ib48f26516e1aca7b23a48d6521ad3dc097d8a095
2021-07-19 22:09:12 +00:00
TreeHugger Robot
62c2c75c41 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: Id7539cd4a65344b062631e39679a9f77814f91bf
2021-07-19 22:08:02 +00:00
TreeHugger Robot
fbb8676b2b Merge "Use binder-based iterator to retrieve FRROs" into sc-dev am: 5be998a660
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302837

Change-Id: If9c7c5521ee2844ff8049e3bbd95461af406a9fa
2021-07-19 22:07:49 +00:00