Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,529 Commits 3 Branches 0 Tags
89d3ca0141766090d378fd30bdfdb7bfe6f74cc6
Commit Graph

660529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
89d3ca0141 Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev am: 30c6383d1d am: 17d1be8efc am: 5cb13bbebf am: a8fd5a822e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287612

Change-Id: I458bc7212fd14d41f32cd1a874e56705b1efccce
 2021-07-20 03:17:16 +00:00
Rambo Wang
e5cdbff679 [automerger skipped] Merge "Clear binder identity in callback of IMS IPC interfaces" into sc-dev am: 4696dc9bf8 am: d50451a030 -s ours 
am skip reason: Merged-In I34225e32111879e155c9f7865f0045430d171467 with SHA-1 c18002c465 is already in history

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

Change-Id: I20470abce1a71ef14758a9180ce668a92b99eaf0
 2021-07-20 03:16:55 +00:00
Tracy Zhou
2ff3a7a9d6 Merge "Remove RecentsOnboarding" into sc-dev am: 6a8ca02c6f am: 41de70158c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333194

Change-Id: I3954ad30a9c90ef5c6a8f4e32522b4e1593aa8dd
 2021-07-20 03:15:44 +00:00
TreeHugger Robot
a8fd5a822e Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev am: 30c6383d1d am: 17d1be8efc am: 5cb13bbebf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287612

Change-Id: Ia5193bc6840887c259e66778851188196dcb5877
 2021-07-20 03:04:38 +00:00
Rambo Wang
d50451a030 Merge "Clear binder identity in callback of IMS IPC interfaces" into sc-dev am: 4696dc9bf8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329696

Change-Id: I5e2f280652352a73c618899b53d3aa4b89549159
 2021-07-20 03:04:31 +00:00
TreeHugger Robot
5cb13bbebf Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev am: 30c6383d1d am: 17d1be8efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287612

Change-Id: I67a349870a799a1cdf3df9577786a326901d65e5
 2021-07-20 02:44:02 +00:00
Rambo Wang
4696dc9bf8 Merge "Clear binder identity in callback of IMS IPC interfaces" into sc-dev 2021-07-20 02:43:16 +00:00
Tracy Zhou
41de70158c Merge "Remove RecentsOnboarding" into sc-dev am: 6a8ca02c6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322566

Fixes: 180248278
Test: manual
Change-Id: I20bdf481212b5eb6cb57ab635592043130166c62
 2021-07-20 02:40:28 +00:00
TreeHugger Robot
17d1be8efc Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev am: 30c6383d1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287612

Change-Id: I2fba182703b7e2362a0cd0934903c6a2af849751
 2021-07-20 02:31:53 +00:00
Tracy Zhou
6a8ca02c6f Merge "Remove RecentsOnboarding" into sc-dev 2021-07-20 02:22:59 +00:00
TreeHugger Robot
30c6383d1d Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev 2021-07-20 02:13:10 +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
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
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
Rambo Wang
67e10842b2 Merge "Clear binder identity in callback of IMS IPC interfaces" 2021-07-20 00:18:40 +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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
5be998a660 Merge "Use binder-based iterator to retrieve FRROs" into sc-dev 2021-07-19 21:55:45 +00:00
Rambo Wang
588ec9f398 Clear binder identity in callback of IMS IPC interfaces 
The binder identity does get cleared when goes from client process
into phone process. When it comes back from phone to client, the
binder identity should also be cleared.

Bug: 193923945
Test: atest android.telephony.cts.TelephonyManagerTest
Test: atest ImsServiceTest RcsFeatureControllerTest ImsMmTelManagerTest
Merged-In: I34225e32111879e155c9f7865f0045430d171467
Change-Id: I34225e32111879e155c9f7865f0045430d171467
(cherry picked from commit c18002c465)
 2021-07-19 14:54:58 -07:00
Andy Hung
e6e2c080e2 Merge "MediaMetricsManager: Authorize log session ids" into sc-v2-dev am: 5a97294940 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15247197

Change-Id: I4bf3aea0626caa25f9fa555c7fda59542a92d398
 2021-07-19 21:46:23 +00:00
Andy Hung
5a97294940 Merge "MediaMetricsManager: Authorize log session ids" into sc-v2-dev 2021-07-19 21:30:31 +00:00
Joshua Mccloskey
5a33c8c58f Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 am: b9745dc605 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: Iefb73c901cc57c999c7cea6e4daeec5355590c8a
 2021-07-19 20:34:45 +00:00
Joshua Mccloskey
b16902ffa4 Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 am: 3b84010e82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: I5ad368bfe3a4e4b3d95705aa6d647120fbb1c950
 2021-07-19 20:28:24 +00:00
Joshua Mccloskey
b9745dc605 Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: Iaa8d50c2a818aa897fb06037afdddc6bd9e1d505
 2021-07-19 20:14:26 +00:00
Joshua Mccloskey
3b84010e82 Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: Ifa25be9aa20a7ee0381329c0e57bd6c61ddcad32
 2021-07-19 20:13:18 +00:00
TreeHugger Robot
a10f077d57 Merge "Showing brightness slider in collapsed QS in split shade" into sc-v2-dev am: 9314834982 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301454

Change-Id: I169313fefd23c01771de3342829530d0c48453ab
 2021-07-19 20:05:17 +00:00
Joshua Mccloskey
4438cf6799 Merge "Fixed double face auth on swipe" into sc-dev 2021-07-19 20:00:57 +00:00
TreeHugger Robot
9314834982 Merge "Showing brightness slider in collapsed QS in split shade" into sc-v2-dev 2021-07-19 19:54:54 +00:00
TreeHugger Robot
b29020ea30 Merge "4/n: Make CoexCoordinator multi-sensor-aware" into sc-dev am: c4815d0f2d am: f75483555a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312046

Change-Id: If5f5a04def4a0211ccdfa698c1711407dd94727b
 2021-07-19 19:47:01 +00:00