Dmitri Plotnikov
c306b3924c
Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev am: 8b22190dfd am: 4211df1c5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15020275
Change-Id: Id7212adad5425855eee1d744f2e388a3dce12035
2021-06-22 15:10:55 +00:00
TreeHugger Robot
322cc899cc
Merge "Remove marquee for QQS Tiles" into sc-dev am: c0af5cac34 am: c100da9702
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15014994
Change-Id: I8748b6f9fff81ca34e82736801cdd9c3422ad8ca
2021-06-22 15:10:44 +00:00
TreeHugger Robot
bb3bde5675
Merge "Catch NoSuchElementException when unbinding print doc death recipient" into sc-dev am: ccc5c7c345 am: 27a3efe103
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15032087
Change-Id: Ibbd6e1dd97b508b00192274fe587beb6ed1f7780
2021-06-22 15:10:15 +00:00
Makoto Onuki
f78856d98b
Merge "Update the javadoc around FGS" into sc-dev am: d97f509923 am: f746092513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14941110
Change-Id: I532f4cac8afef4514e6e3e93e6217fbb0d29dd1f
2021-06-22 15:09:57 +00:00
Ming-Shin Lu
132fff7b1b
Merge "Calling updateImeParent when the layering target is staled" into sc-dev am: cae02ff4dc am: 7916b69e2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14842887
Change-Id: I240d8ed0b60141070556431bd8fb34d17def91c3
2021-06-22 15:09:36 +00:00
Evan Chen
5215af880c
Merge "Fix system crash when unpair app" into sc-dev am: 891f3034ea am: ccd4e76c99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14903799
Change-Id: I6b4dbfd1cb96901f453ede6ede21901abe37347f
2021-06-22 15:09:03 +00:00
TreeHugger Robot
f9cfb0085e
Merge "resolve merge conflicts of 8f21448a7a to sc-v2-dev" into sc-v2-dev am: 647c5d86cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15026388
Change-Id: I52deae50d6c3fdf4f197c597f3d4756b3c561523
2021-06-22 15:08:42 +00:00
Dmitri Plotnikov
4211df1c5d
Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev am: 8b22190dfd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15020275
Change-Id: I78f1728328adbb1003bde645cab776200bfd7752
2021-06-22 14:56:31 +00:00
TreeHugger Robot
c100da9702
Merge "Remove marquee for QQS Tiles" into sc-dev am: c0af5cac34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15014994
Change-Id: Ic4222e736aac2d2861d44962d9d85911096186e6
2021-06-22 14:56:19 +00:00
TreeHugger Robot
27a3efe103
Merge "Catch NoSuchElementException when unbinding print doc death recipient" into sc-dev am: ccc5c7c345
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15032087
Change-Id: I4cb5447a29155cd3b88fe3ec52982e86c3559f98
2021-06-22 14:56:06 +00:00
Makoto Onuki
f746092513
Merge "Update the javadoc around FGS" into sc-dev am: d97f509923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14941110
Change-Id: Ia183dc6ff376e1cde8c553c45ce3c8b060ce7866
2021-06-22 14:55:55 +00:00
Ming-Shin Lu
7916b69e2b
Merge "Calling updateImeParent when the layering target is staled" into sc-dev am: cae02ff4dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14842887
Change-Id: Ib138cbd353cfa2e947ba790d873f1384b55a1fc0
2021-06-22 14:55:44 +00:00
Evan Chen
ccd4e76c99
Merge "Fix system crash when unpair app" into sc-dev am: 891f3034ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14903799
Change-Id: I83f4d25807e66fcdaa151d96fcff39e93d827a41
2021-06-22 14:55:32 +00:00
TreeHugger Robot
647c5d86cb
Merge "resolve merge conflicts of 8f21448a7a to sc-v2-dev" into sc-v2-dev
2021-06-22 14:54:47 +00:00
TreeHugger Robot
2a3ce46f97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6f129c3ef0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15061110
Change-Id: I0b1f5452ecb02b97cf8528591ef24efceefc5cb8
2021-06-22 14:07:52 +00:00
TreeHugger Robot
730fd7e6d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d1633e8007 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15064506
Change-Id: Ib276a8e29fab14512bd2fbb7593f05bc57b3e027
2021-06-22 14:07:14 +00:00
TreeHugger Robot
8e406859a6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1d00f5b68 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15064507
Change-Id: I537b8646b087710cce5698ac699c51e96c5976c7
2021-06-22 14:06:36 +00:00
TreeHugger Robot
6f129c3ef0
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-22 13:53:28 +00:00
TreeHugger Robot
d1633e8007
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-22 13:50:27 +00:00
TreeHugger Robot
a1d00f5b68
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-22 13:48:37 +00:00
Bill Yi
1d31ffd0b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iefba21bdf23a7e61402a1505e47d83d58fa5d147
2021-06-22 11:28:53 +00:00
Bill Yi
df6785ce23
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie2b80133e5c72b6de2967c0e99e203ebcbb002d2
2021-06-22 11:27:23 +00:00
Charles Chen
46c16674f6
Merge "Move initialization from onCreate to attachBaseContext" into sc-v2-dev am: 4a20c9425a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15048195
Change-Id: Idee6552c7f73f56693408988db8b2f709a059ac3
2021-06-22 10:17:22 +00:00
Charles Chen
4a20c9425a
Merge "Move initialization from onCreate to attachBaseContext" into sc-v2-dev
2021-06-22 09:24:34 +00:00
TreeHugger Robot
319b0f061b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2e8baa1078 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15055095
Change-Id: Ia4396d479b44d6a46ecb86ee8510e93be7540c71
2021-06-22 08:05:57 +00:00
TreeHugger Robot
2e8baa1078
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-22 07:46:21 +00:00
Bill Yi
3c3ab9a584
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5155d7e28e8bdd1aefd246e356f94d040831de03
2021-06-22 07:24:45 +00:00
Charles Chen
dd4a748af0
Move initialization from onCreate to attachBaseContext
...
Previously we initialize WindowManager and associate DisplayArea in onCreate,
but apps may use WindowManager before WindowProviderService#onCreate.
The code may be like:
```
public void onCreate() {
WindowManager wm = getSystemService(Windowmanager.class);
wm.getCurrentWindowMetrics().getBounds(); // <--- crash here
super.onCreate()
...
}
```
This CL move the initialization step to attachBaseContext to prevent
the crash.
Test: atest WindowContextTests
Test: run gsi_avd/boot_health/vendor_img_rvc on ABTD
Bug: 191635763
Change-Id: Id8bad73a749813a90b307ac2b4d020f740631ea3
2021-06-22 13:55:12 +08:00
Bill Yi
b1577d712a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3577229065b633c85f9de3db28bff97e27e2443c
2021-06-22 03:36:05 +00:00
TreeHugger Robot
94d585f5f0
Merge "Register binder-depth per remote animation" into sc-v2-dev am: 859ef211a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15033498
Change-Id: Id53861aa026fa2090bd5e930217f6dea803ea1e5
2021-06-22 02:26:15 +00:00
TreeHugger Robot
859ef211a6
Merge "Register binder-depth per remote animation" into sc-v2-dev
2021-06-22 02:10:57 +00:00
TreeHugger Robot
0445022d79
Merge "MotionEvent: Add relative X and Y fields to PointerCoords" into sc-v2-dev am: 84e98dfd76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14741432
Change-Id: I2e29ce73633e732be77bf19b9133fb904baf027b
2021-06-22 00:55:48 +00:00
TreeHugger Robot
84e98dfd76
Merge "MotionEvent: Add relative X and Y fields to PointerCoords" into sc-v2-dev
2021-06-22 00:41:37 +00:00
Chavi Weingarten
d54e3940f5
resolve merge conflicts of 8f21448a7a to sc-v2-dev
...
Change-Id: I494b81f172c869f247e5aa110987424948a0a3a5
Bug: 177864415
2021-06-21 20:15:49 +00:00
Winson Chung
58e727aa63
Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f566 am: 89da3fbc74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14951219
Change-Id: If01830e13e4343725e611e43ec31a9151c90653b
2021-06-21 20:07:42 +00:00
Automerger Merge Worker
519cdfe9d6
Merge "Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f566 am: f8ca1f7ef9" into sc-v2-dev-plus-aosp
2021-06-21 20:07:27 +00:00
Winson Chung
4cf3b09b59
Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f566 am: f8ca1f7ef9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14951219
Change-Id: I90edf28616fa1e0d0b5b0b354c956de33d7b1e75
2021-06-21 20:07:18 +00:00
TreeHugger Robot
8958341af0
Merge "Hook WakefulnessLifecycle for best timing of LockedDisabled" into sc-dev am: aadedc76b6 am: 403f6ceb32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002670
Change-Id: If18fe4cb5fe6fdead5706117609aa1007542c175
2021-06-21 20:07:12 +00:00
Winson Chung
89da3fbc74
Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f566
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14951219
Change-Id: I194c494a464c7d1be0ea83bbb19740e93200c9b4
2021-06-21 20:00:06 +00:00
Winson Chung
f8ca1f7ef9
Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f566
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14951219
Change-Id: Ic6670c6dca92843cb56d124af2e404b64a8e24b0
2021-06-21 19:58:24 +00:00
TreeHugger Robot
403f6ceb32
Merge "Hook WakefulnessLifecycle for best timing of LockedDisabled" into sc-dev am: aadedc76b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002670
Change-Id: I9fbc141b015c34d026e7f17b7d11bece5628e6f8
2021-06-21 19:57:19 +00:00
Dmitri Plotnikov
8b22190dfd
Merge "Reduce size of BatteryUsageStats Parcel" into sc-dev
2021-06-21 19:57:08 +00:00
TreeHugger Robot
be29d5070b
Merge "Hook WakefulnessLifecycle for best timing of LockedDisabled" into sc-dev am: aadedc76b6 am: 9c2c1fac7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002670
Change-Id: I59c1c299a6678309a1d7c1966602e4971cf9fbd4
2021-06-21 19:55:12 +00:00
TreeHugger Robot
231d66613f
[automerger skipped] Merge "Bluetooth: fix comments on Volume Control Profile review" into sc-dev-plus-aosp am: 8776aff8ee -s ours
...
am skip reason: Merged-In I72b36b77aa97aa9501d13ecdfe0b9b7f49bcce2c with SHA-1 37c700dbbe is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027114
Change-Id: I174f46477ccec16c46091beb8c8977f1dfe4ef28
2021-06-21 19:54:57 +00:00
TreeHugger Robot
9c2c1fac7a
Merge "Hook WakefulnessLifecycle for best timing of LockedDisabled" into sc-dev am: aadedc76b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15002670
Change-Id: I1d7ab43a93e9afdf20baf819a1e962d0513991b0
2021-06-21 19:54:31 +00:00
Yuanjia Hsu
16bc108ddf
Revert "Exports API to allow RULE_MATCH_UID support both RECORDE..." am: 24c28a092b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981564
Change-Id: I9e1338025e66b24ba79b14bd6c74bae7d9f59b8d
2021-06-21 19:54:29 +00:00
TreeHugger Robot
c0af5cac34
Merge "Remove marquee for QQS Tiles" into sc-dev
2021-06-21 19:31:05 +00:00
TreeHugger Robot
8776aff8ee
Merge "Bluetooth: fix comments on Volume Control Profile review" into sc-dev-plus-aosp
2021-06-21 18:40:06 +00:00
TreeHugger Robot
ccc5c7c345
Merge "Catch NoSuchElementException when unbinding print doc death recipient" into sc-dev
2021-06-21 18:28:11 +00:00
Makoto Onuki
d97f509923
Merge "Update the javadoc around FGS" into sc-dev
2021-06-21 18:04:37 +00:00