Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
627,444 Commits 3 Branches 0 Tags
8a43d3dcddd763fec555afbdc9772ea4e9d7c562
Commit Graph

627444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8a43d3dcdd Merge "Remove iwlan mac config" into sc-dev am: e7f53e4de5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13628333

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic669006efd1430db0ceba3f7e476743cf33d13d3
 2021-02-20 21:13:51 +00:00
TreeHugger Robot
356c359096 Merge "Add discharge power estimates to BatteryUsageStats" into sc-dev am: 9fb89c22ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13538912

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I157de70b2b18f5c909712d575ebf8a64f59c2e7b
 2021-02-20 21:13:34 +00:00
TreeHugger Robot
e7f53e4de5 Merge "Remove iwlan mac config" into sc-dev 2021-02-20 20:39:07 +00:00
TreeHugger Robot
9fb89c22ca Merge "Add discharge power estimates to BatteryUsageStats" into sc-dev 2021-02-20 20:34:33 +00:00
TreeHugger Robot
8c842ed8be Merge "Avoid duplicate callback logs in the dump" into sc-dev am: 16962d7ed8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13581377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25e3b7f2fde594c0ae7a91329b245cde2c98703b
 2021-02-20 19:40:28 +00:00
Mike Reed
ab3023b2d4 Merge "Simplify calling loopers" into sc-dev am: 023b87e1ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2238102ad65a647cdc5b464793dd9dbef221189
 2021-02-20 19:40:16 +00:00
TreeHugger Robot
323d82b82d Merge "Add private gpu and total dmabuf size to SystemMemory atom" into sc-dev am: 20f9ba618f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13575045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bd2a05095bd88d40d35f522ba6dd17fbc1091d2
 2021-02-20 19:40:00 +00:00
TreeHugger Robot
78ad88ad6d Merge "Fix the A11y issues in the InternetTile" into sc-dev am: 7b3170e425 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82bb114bc59b2433c904a26755fc74b9cdc7daa2
 2021-02-20 19:39:15 +00:00
TreeHugger Robot
16962d7ed8 Merge "Avoid duplicate callback logs in the dump" into sc-dev 2021-02-20 19:03:55 +00:00
Mike Reed
023b87e1ec Merge "Simplify calling loopers" into sc-dev 2021-02-20 18:53:49 +00:00
TreeHugger Robot
20f9ba618f Merge "Add private gpu and total dmabuf size to SystemMemory atom" into sc-dev 2021-02-20 18:48:52 +00:00
TreeHugger Robot
7b3170e425 Merge "Fix the A11y issues in the InternetTile" into sc-dev 2021-02-20 18:38:47 +00:00
Junyu Lai
d351b813a9 Merge "[FUI15] Remove networkId in NetworkState" am: 3237216211 am: f5fbe10aa7 am: eb70fc6721 am: 6e0fc99a23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e1eb35ae2ca97ce09fe79792d681111286c26a4
 2021-02-20 18:20:27 +00:00
Junyu Lai
6e0fc99a23 Merge "[FUI15] Remove networkId in NetworkState" am: 3237216211 am: f5fbe10aa7 am: eb70fc6721 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c03c39a069e0ad9760ab5b411caf69a9fdcf45
 2021-02-20 17:03:44 +00:00
TreeHugger Robot
0ed305ea08 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:59:08 +00:00
TreeHugger Robot
c4338920b4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:57:07 +00:00
TreeHugger Robot
88f674ef03 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:43:45 +00:00
TreeHugger Robot
4688ac0ab8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c4710e19c8 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie760deeaf672e4991626e7fa9ed30f6ce2541fd6
 2021-02-20 16:41:33 +00:00
TreeHugger Robot
94f03bb3e0 Merge changes Id02aa26e,Iaafb1a0a into sc-dev am: 8a071ee647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13625990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib67571c53c542785a373f7be09cb48090f13bc6f
 2021-02-20 16:37:31 +00:00
Junyu Lai
eb70fc6721 Merge "[FUI15] Remove networkId in NetworkState" am: 3237216211 am: f5fbe10aa7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b833f1a9c95ad61190182e48a1b6e8ad3bf8807
 2021-02-20 16:36:54 +00:00
TreeHugger Robot
996942a52a Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:29:13 +00:00
TreeHugger Robot
c4710e19c8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-02-20 16:28:14 +00:00
TreeHugger Robot
99b26102bb Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:24:50 +00:00
TreeHugger Robot
8a071ee647 Merge changes Id02aa26e,Iaafb1a0a into sc-dev 
* changes:
  Refactor One handed mode Unit tests
  Do not register + unregister DA in the same call
 2021-02-20 16:23:36 +00:00
TreeHugger Robot
5bfb958610 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:23:01 +00:00
TreeHugger Robot
c16964417b Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:19:11 +00:00
Automerger Merge Worker
d7c4ba59b8 Merge "Merge "Fix USB HAL interface binder" into sc-dev am: 929160184d" 2021-02-20 16:17:16 +00:00
TreeHugger Robot
a734447b76 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:17:11 +00:00
TreeHugger Robot
cd0ffb4acb Merge "Fix USB HAL interface binder" into sc-dev am: 929160184d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13610324

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If298fa81a045bc0e1a8544a7bd1c877b287b68db
 2021-02-20 16:17:09 +00:00
TreeHugger Robot
5c40c16115 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:16:50 +00:00
TreeHugger Robot
0911e99113 Merge "Specify version for aidl_interface explicitly" into sc-dev am: c9ad4f00db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13622745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44ffef681f14e39c649bbd8f982092bfd15a0bf5
 2021-02-20 16:16:27 +00:00
TreeHugger Robot
0d3272f6a7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:15:41 +00:00
TreeHugger Robot
418592b946 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:14:35 +00:00
TreeHugger Robot
cb28266146 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:12:30 +00:00
TreeHugger Robot
ccaff54d22 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-02-20 16:08:47 +00:00
TreeHugger Robot
929160184d Merge "Fix USB HAL interface binder" into sc-dev 2021-02-20 15:52:07 +00:00
Junyu Lai
f5fbe10aa7 Merge "[FUI15] Remove networkId in NetworkState" am: 3237216211 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9243f1cc94c73e3312f3a85fa34d3499bc92accd
 2021-02-20 15:51:56 +00:00
TreeHugger Robot
c9ad4f00db Merge "Specify version for aidl_interface explicitly" into sc-dev 2021-02-20 15:29:19 +00:00
Junyu Lai
3237216211 Merge "[FUI15] Remove networkId in NetworkState" 2021-02-20 14:00:19 +00:00
Treehugger Robot
bcbc5aee6d Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 am: 7fa15840a8 am: 55cd97f94c am: 657ec5c846 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578423

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fe78cb1676f0d5737fc37409d2edba035afaba2
 2021-02-20 13:13:09 +00:00
Treehugger Robot
657ec5c846 Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 am: 7fa15840a8 am: 55cd97f94c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578423

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia73cdbf546322a3579e384cc61e2076483d068df
 2021-02-20 12:25:30 +00:00
TreeHugger Robot
072d079ede Merge "Fix The education UI above one-handed mode isn't localized and Display size changes" into sc-dev am: 9801436e7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13432353

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67b1eced4442c8033f370e908d23f05e6abb837c
 2021-02-20 12:05:29 +00:00
TreeHugger Robot
cb638b610e Merge "Hide Keyboard when the remote input view became invisible" into sc-dev am: 89b98e9357 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13610317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I624c7c4f729da0acdcccaf30da3aca4bc7c3b5c9
 2021-02-20 12:05:16 +00:00
TreeHugger Robot
9801436e7f Merge "Fix The education UI above one-handed mode isn't localized and Display size changes" into sc-dev 2021-02-20 12:03:43 +00:00
JW Wang
82edd27b58 Merge changes I17d87bae,Ie975e591,I6880b9b9,Ic752c7f3 into sc-dev am: c43bbe80d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13449180

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib72b93f86f27292d68af52f775092b100b0ccffb
 2021-02-20 12:00:42 +00:00
Treehugger Robot
55cd97f94c Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 am: 7fa15840a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578423

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97ec4f0aa946c4847aaa5ff1ddc77c0d133d65f7
 2021-02-20 11:42:26 +00:00
Gavin Corkery
1704279f24 Merge "Add REBOOT_READY broadcast" into sc-dev am: 515af7889f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13454847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56f602bb71c99dafb1572fc2da387834939cf174
 2021-02-20 11:36:46 +00:00
TreeHugger Robot
89b98e9357 Merge "Hide Keyboard when the remote input view became invisible" into sc-dev 2021-02-20 10:56:53 +00:00
JW Wang
c43bbe80d9 Merge changes I17d87bae,Ie975e591,I6880b9b9,Ic752c7f3 into sc-dev 
* changes:
  Add a TEST_MAPPING (9/n)
  Fix insufficient synchronization (8/n)
  Fix a race in the callback (7/n)
  setExplicitHealthCheckEnabled() needs to set mSyncRequired (6/n)
 2021-02-20 10:45:27 +00:00
Gavin Corkery
515af7889f Merge "Add REBOOT_READY broadcast" into sc-dev 2021-02-20 10:44:38 +00:00