Commit Graph

654180 Commits

Author SHA1 Message Date
tim peng
c3d95d633e Merge "Disable volume control bar for all remote devices" into sc-dev am: deb10abc4f am: da111d3987
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498913

Change-Id: I112c885a3c798612f25e78bd702cb0a4c6622959
2021-08-11 03:11:51 +00:00
tim peng
9a003d5b18 Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad24809c am: 17590c3a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498082

Change-Id: I58d714a9be9280360bd9dc0b6e048c613445a6e8
2021-08-11 03:11:39 +00:00
Sudheer Shanka
4cbe7fc6f8 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours am: afeb24ebbd -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I89d30316f751650584ccb849d018ffed621b5c6e
2021-08-11 03:11:29 +00:00
Sudheer Shanka
70db6f108f [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab am: 994735d6c4 -s ours am: 7f2cf3b4b8 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: I9403b6afe5234a1302a03a1de3c9e34c5eb7ad3d
2021-08-11 03:11:17 +00:00
Sudheer Shanka
d61f0ce9ca [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours am: 9ec070a785 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history

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

Change-Id: Ic8c6bc8b48d8f02c81ffbe63644161b3abcd0ddf
2021-08-11 03:11:16 +00:00
Sudheer Shanka
a7d40af8a5 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev am: 98adfca8a6 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 452a5aeec5 is already in history

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

Change-Id: I75e673c695d4e91409ae09ae14f54726b7b2cd68
2021-08-11 03:11:15 +00:00
Sudheer Shanka
48751efe6d [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev am: bcb801ef06 -s ours am: d8128cecab -s ours am: 199e4b552e -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 3ae33de924 is already in history

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

Change-Id: I1ab2bcaf4687667595ae824d55b60f2bedfb4ff4
2021-08-11 03:11:13 +00:00
Sudheer Shanka
7fd087e9d7 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab -s ours am: 82b6a36a0a -s ours am: 9a09cdf965 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 16732a1253 is already in history

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

Change-Id: I145eb320afbe0a722b84d2368bc77ec2a371e106
2021-08-11 03:11:10 +00:00
Sudheer Shanka
0e04f5ea34 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: Id67b8c2fa6c309edf421e65f6619961de041edce
2021-08-11 03:11:09 +00:00
Sudheer Shanka
c1b3a16c94 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours am: ec27887633 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I8b336942ac4ec98eb16fb1fd91c43670b501bf1e
2021-08-11 03:11:05 +00:00
Sudheer Shanka
f305cf08ee [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25 am: 8252fb118c -s ours am: 77547e1deb -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: Ic8961fad98f46c8d0f7fc4082e837133ca0a7b51
2021-08-11 03:11:02 +00:00
Sudheer Shanka
88bcfad227 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours am: d44234aea4 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: Idbda66157ab36d09551fe31fe481a82b7d90cdbe
2021-08-11 03:10:53 +00:00
Sudheer Shanka
8222482444 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab am: 994735d6c4 -s ours am: 7f2cf3b4b8 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: I1b2b64a15aa64973cf4796cecff80231dd9971c4
2021-08-11 03:10:49 +00:00
Sudheer Shanka
95e116139c [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours am: ec27887633 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: Ia92dafc60a3c1670e47b0686df87a2838a4e1cd0
2021-08-11 03:10:45 +00:00
Sudheer Shanka
ac5a7839bb [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev am: bcb801ef06 -s ours am: d8128cecab -s ours am: 199e4b552e -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 3ae33de924 is already in history

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

Change-Id: Ie54db94f7091839a0ffd8a8641207ab28e274c77
2021-08-11 03:10:42 +00:00
Sudheer Shanka
2a20338efa [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25 am: 8252fb118c -s ours am: 77547e1deb -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: I1687e363e528b300fdeffe192c8e2781eb62dcd3
2021-08-11 03:10:27 +00:00
Sudheer Shanka
230e6dcccf [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab -s ours am: 82b6a36a0a -s ours am: 9a09cdf965 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 16732a1253 is already in history

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

Change-Id: I3b9a3974544958122341a7e1086d127c12cfcd9b
2021-08-11 03:10:20 +00:00
Govinda Wasserman
3f3563c3ae Fixes AssistOrbController crash
AssistOrbController caused a crash by trying to remove a view that was
not attached. This change adds a check if the view is attached before
removal.

Test: Tested locally
BUG: 195902117
FIX: 195902117
Change-Id: Ibc65a9b1789c7ee629c28de31392fffc0536ed70
2021-08-10 23:10:00 -04:00
tim peng
0b395f0059 Merge "Disable volume control bar for all remote devices" into sc-dev am: deb10abc4f am: a08e2271ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498913

Change-Id: Ib57b1926d68ad95d268229fde4fc2f3ea971fca8
2021-08-11 03:06:51 +00:00
tim peng
42d0f5257c Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad24809c am: 2d2920dfd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498082

Change-Id: Ida8204d2a37ed978ea7fecce6e412a80184058b0
2021-08-11 03:06:49 +00:00
Sudheer Shanka
c26aef9626 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours am: f4bcd80404 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history

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

Change-Id: Icf53f158b5ce31921a8b22c47939cd38e1151f5f
2021-08-11 03:06:31 +00:00
Sudheer Shanka
7f2cf3b4b8 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab am: 994735d6c4 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: I6a03a3bac7dcf1aa639673b61f770c887066b2bc
2021-08-11 03:02:24 +00:00
jiayongqiang
079495ac63 Fix thread safety issues;
There are two threads can modify "mLastChanged" and "mScreenState" variables:
1. onFinishedWakingUp()/onFinishedGoingToSleep() are called from main thread in system_server;
2. setDeviceFolded() is called from android.display thread in
system_server.

Otherwise, NullPointerException might be throw when invoke method 'long java.lang.Long.longValue()'.

Test: press power key to wake up the device and fold the device at the
same time.

Change-Id: I3a0f1862548f2e567baa8a4a615906dbf87a8243
Signed-off-by: jiayongqiang <jiayongqiang@xiaomi.com>
2021-08-11 10:57:15 +08:00
Sudheer Shanka
d44234aea4 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6 am: b95ca39e29 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 d02b731699 is already in history

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

Change-Id: If25f54c6813f6afb09ca7766de8b816e477268b0
2021-08-11 02:56:41 +00:00
Sudheer Shanka
199e4b552e [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev am: bcb801ef06 -s ours am: d8128cecab -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 3ae33de924 is already in history

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

Change-Id: I4170989af5a828756c4253a9575686160c5813f0
2021-08-11 02:56:32 +00:00
Sudheer Shanka
ec27887633 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours am: 6c8bcd9dd4 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I89297b3cbdfc3ae1de551365341208faf8b740fe
2021-08-11 02:56:31 +00:00
Sudheer Shanka
9a09cdf965 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab -s ours am: 82b6a36a0a -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 16732a1253 is already in history

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

Change-Id: If7f53fbb9daee54976b4f65912d1d596c99ee2a1
2021-08-11 02:56:08 +00:00
Sudheer Shanka
afeb24ebbd [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev am: b10d3c4609 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 c72848f9fe is already in history

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

Change-Id: I3c09c148a9bdebce36144b1f779d9f726127ea4e
2021-08-11 02:56:07 +00:00
Sudheer Shanka
b95ca39e29 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev am: e8426090a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301703

Change-Id: I56e45bdc455fe62f0f26a4e49b35deaab56206b0
2021-08-11 02:56:07 +00:00
Sudheer Shanka
77547e1deb [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25 am: 8252fb118c -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 e329730572 is already in history

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

Change-Id: If808dcb75c3429ef8e36e771a3e6f6c895d726ce
2021-08-11 02:56:06 +00:00
Sudheer Shanka
98adfca8a6 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into pi-dev 2021-08-11 02:55:31 +00:00
tim peng
da111d3987 Merge "Disable volume control bar for all remote devices" into sc-dev am: deb10abc4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498913

Change-Id: I66d18980f3d141d74334356aab7d484869bc481e
2021-08-11 02:54:30 +00:00
tim peng
17590c3a10 Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad24809c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498082

Change-Id: I0fc04f92e28c1a758ed4746d29ff794108d58a5d
2021-08-11 02:54:28 +00:00
Sudheer Shanka
9ec070a785 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history

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

Change-Id: If1342fb8923ba8c081d851a86527f79df35deea2
2021-08-11 02:53:35 +00:00
tim peng
a08e2271ea Merge "Disable volume control bar for all remote devices" into sc-dev am: deb10abc4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498913

Change-Id: I11f82e3ce0d1fd6d7c2d014e3090f2bbad89267f
2021-08-11 02:53:01 +00:00
tim peng
2d2920dfd0 Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad24809c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498082

Change-Id: Ia9c9e9720903692169f01ff0c378bb478cef978e
2021-08-11 02:52:56 +00:00
Sudheer Shanka
f4bcd80404 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history

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

Change-Id: I6c9b9364f216a7f8d79092d08ef26d453773ab94
2021-08-11 02:52:23 +00:00
Sudheer Shanka
e8426090a6 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into qt-dev 2021-08-11 02:51:07 +00:00
tim peng
deb10abc4f Merge "Disable volume control bar for all remote devices" into sc-dev 2021-08-11 02:44:47 +00:00
tim peng
10ad24809c Merge "Disable volume control bar for all remote devices" into sc-dev 2021-08-11 02:44:47 +00:00
Sudheer Shanka
b10d3c4609 Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev 2021-08-11 02:44:06 +00:00
Sudheer Shanka
6c8bcd9dd4 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours am: c7ee5074b3 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: Id153e2b3a60d15cb9e0098ec6a41198874d04c5a
2021-08-11 02:43:12 +00:00
Sudheer Shanka
29c9f61d92 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev am: bcb801ef06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301701

Change-Id: I5e6f25fe3b29fd548408f115e064c7e27ff67c6c
2021-08-11 02:40:22 +00:00
Sudheer Shanka
994735d6c4 Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053177

Change-Id: Id4da32ee1585d2b747a7a0ab2188ba3304a17970
2021-08-11 02:39:52 +00:00
Sudheer Shanka
c7ee5074b3 [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev am: df8ca125d6 -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 29eb352baa is already in history

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

Change-Id: I8815ce52e7db701ab389abd023ed546c4ee5b1fb
2021-08-11 02:39:46 +00:00
Sudheer Shanka
8252fb118c Merge "Send targeted broadcasts to prevent other apps from receiving them." into qt-dev am: 0925f07c25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053176

Change-Id: I09a0140925f7c851ff64a131c5ad233161b91625
2021-08-11 02:39:23 +00:00
Sudheer Shanka
d8128cecab [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-dev am: bcb801ef06 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 3ae33de924 is already in history

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

Change-Id: Id36ae7f4d78e9786257af09f7037a6214a3d6755
2021-08-11 02:39:20 +00:00
Sudheer Shanka
82b6a36a0a [automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-dev am: 9c8226caab -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 16732a1253 is already in history

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

Change-Id: I03ea9d3f8aae788474fea24d960869ba67e3bc96
2021-08-11 02:38:56 +00:00
Sudheer Shanka
5a215b12a2 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history

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

Change-Id: If94c8cc284ce2ef680fda35412ce7b145883374f
2021-08-11 02:34:52 +00:00
Sudheer Shanka
df8ca125d6 Merge "Send targeted broadcasts to prevent other apps from receiving them." into pi-dev 2021-08-11 02:29:11 +00:00