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

627481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d65a70f905 Merge "Allow temporary locked OHM function disabled when keyguard visible" into sc-dev am: 7444a36439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13621336

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02bd3881694d2ae9d6ee0db63dfa0fb76e0911eb
 2021-02-21 18:35:38 +00:00
Dmitri Plotnikov
5363df4157 Merge "Copy custom measured power to BatteryUsageStats" into sc-dev am: 919528f401 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13564227

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c3c00c53721aaf0604cf718dbcb16961fe525c6
 2021-02-21 18:35:11 +00:00
Bob Badour
993792f383 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-02-21 18:31:22 +00:00
TreeHugger Robot
7444a36439 Merge "Allow temporary locked OHM function disabled when keyguard visible" into sc-dev 2021-02-21 18:22:58 +00:00
Dmitri Plotnikov
919528f401 Merge "Copy custom measured power to BatteryUsageStats" into sc-dev 2021-02-21 17:33:31 +00:00
Ching-Sung Li
9a82a8044f Load defeault wallpaper based on device's CMF color am: 758c663e8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13628026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I250356b897828f87926e6e0227f6d0b990883d8a
 2021-02-21 15:27:11 +00:00
Ching-Sung Li
758c663e8f Load defeault wallpaper based on device's CMF color 
Load default wallpaper based on device's CMF color in WallpaperManager.
Fall back to default if wallpaper for corresponding color is not
available.

Bug: 178161042
Test: Build ROM and manual test
Change-Id: I9da1254c64ab21e2a2cde53cc6f474a666eda1f6
 2021-02-21 15:01:46 +00:00
Jin Seok Park
81ed7bd9a1 Merge "[Media ML] Expose config values for OEMs to set custom classes" into sc-dev am: ee9b56d9bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13451717

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f1a7a5e20c744ee9bafd37a999235b3602941cc
 2021-02-21 14:37:33 +00:00
Jin Seok Park
ee9b56d9bc Merge "[Media ML] Expose config values for OEMs to set custom classes" into sc-dev 2021-02-21 11:27:39 +00:00
Chris Fries
f8b8a2f3eb Merge "Revert "Simplify calling loopers"" into sc-dev am: e502fe683a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13643237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7ec504d0a856313e79b8121dad6a878836a8d78
 2021-02-21 07:56:55 +00:00
James Mattis
83b06f3df3 Merge "Using defensive copy for default request remove" am: 1444e3eea1 am: 6cc86364fb am: 463695caae am: b69e99424e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04ff2649d2bfbd72cd1cd96fcae533f836a1faab
 2021-02-21 07:56:29 +00:00
Chris Fries
e502fe683a Merge "Revert "Simplify calling loopers"" into sc-dev 2021-02-21 07:08:31 +00:00
James Mattis
b69e99424e Merge "Using defensive copy for default request remove" am: 1444e3eea1 am: 6cc86364fb am: 463695caae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a67077a777654a50f3cff385d48a65c9dd71e85
 2021-02-21 06:51:29 +00:00
James Mattis
463695caae Merge "Using defensive copy for default request remove" am: 1444e3eea1 am: 6cc86364fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e342da488c7b9271b135a462312d3275abde692
 2021-02-21 06:15:29 +00:00
James Mattis
6cc86364fb Merge "Using defensive copy for default request remove" am: 1444e3eea1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f49286ef328f95212fec94a5d747aa2936a88ef
 2021-02-21 05:15:14 +00:00
James Mattis
1444e3eea1 Merge "Using defensive copy for default request remove" 2021-02-21 04:28:13 +00:00
Chris Fries
1edec35288 Revert "Simplify calling loopers" 
This reverts commit 07c0b7c0d1.

Reason for revert: http://b/180818875 systemui crashloops in libhwui

Change-Id: Id62860d43d7fac572bd94ebc4fe5cc1ff7cc6820
 2021-02-21 03:49:09 +00:00
James Mattis
ac6e4ddf5c Merge "Unit test automation for Multilayer Evaluation" am: c1115803bc am: 762fabc387 am: 5fdad41112 am: f01c170ce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6f970a9e8d54f606efa7bd69446d4cadd07f6de
 2021-02-20 23:52:43 +00:00
Treehugger Robot
ad233834f8 Merge "Keystore 2.0: Revisite Authorization.java" am: 08bf2e8f49 am: fe60537082 am: 20d7e967d2 am: 824e654d27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia634e0b6d47a94ee56607af3f9077c6163ffc359
 2021-02-20 23:51:30 +00:00
James Mattis
ff5fb79411 Using defensive copy for default request remove 
Passing in a defensive copy for the default requests in
ConnectivityService prior to updating that collection so as to not have
issues when removing elements as part of the per-app preference update
flow.

Bug: 176494815
Bug: 178632672
Test: atest FrameworksNetTests
atest FrameworksNetTests:com.android.server
.ConnectivityServiceTest#testSetOemNetworkPreference
ClearPreviousOemValues --iterations

Change-Id: Ia683d5035dda2be35fd2f2b7ee038e806caab6f9
 2021-02-20 15:51:24 -08:00
James Mattis
f01c170ce6 Merge "Unit test automation for Multilayer Evaluation" am: c1115803bc am: 762fabc387 am: 5fdad41112 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d3de8491541219c9ef1faa461c3160cc988e01
 2021-02-20 23:14:57 +00:00
Treehugger Robot
824e654d27 Merge "Keystore 2.0: Revisite Authorization.java" am: 08bf2e8f49 am: fe60537082 am: 20d7e967d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad78430492ee0838456796df741aa2ac81e12692
 2021-02-20 23:14:25 +00:00
James Mattis
5fdad41112 Merge "Unit test automation for Multilayer Evaluation" am: c1115803bc am: 762fabc387 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27cc11033aa430ba5af00773351bb5e54b488aff
 2021-02-20 22:40:03 +00:00
Treehugger Robot
20d7e967d2 Merge "Keystore 2.0: Revisite Authorization.java" am: 08bf2e8f49 am: fe60537082 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06162f5c78a30af9f7c7dd8ca2d101417f5b4f24
 2021-02-20 22:36:43 +00:00
James Mattis
762fabc387 Merge "Unit test automation for Multilayer Evaluation" am: c1115803bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579206

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I888bc951d1e54d4773f06fa9b61eefe815eb5462
 2021-02-20 22:10:34 +00:00
Treehugger Robot
fe60537082 Merge "Keystore 2.0: Revisite Authorization.java" am: 08bf2e8f49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I152776851eaed8754e4ea6033d5606da99e4ae1a
 2021-02-20 22:07:27 +00:00
Dmitri Plotnikov
66a11604f5 Copy custom measured power to BatteryUsageStats 
Bug: 158137862
Test: atest FrameworksCoreTests:com.android.internal.os.CustomMeasuredPowerCalculatorTest
Change-Id: I53a974baf773f35eb212f234755c553be45336ce
 2021-02-20 13:38:48 -08:00
James Mattis
c1115803bc Merge "Unit test automation for Multilayer Evaluation" 2021-02-20 21:23:45 +00:00
TreeHugger Robot
6b7b0bb8f6 Merge "Rehide the API" into sc-dev am: 77501ebc3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13612502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id07ffb80e3a8234e584be3d59f74ed6b38628fb5
 2021-02-20 21:14:05 +00:00
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
77501ebc3d Merge "Rehide the API" into sc-dev 2021-02-20 20:40:23 +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
Bill Lin
d418e0861b Allow temporary locked OHM function disabled when keyguard visible 
- User is easier to mis-trigger OHM when keyguard showing
  it's make sense to disabled OHM when keyguard showing
- Resolve OneHandedControllerTest flaky

Test: atest WMShellUnitTests
Test: manual enable OHM, when keyguard showing OHM can not trigger
Bug: 179044949
Bug: 180682204
Change-Id: I59399e35c7f7bc895df006f54b43e572a9463fd1
 2021-02-21 04:27:37 +08: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
08bf2e8f49 Merge "Keystore 2.0: Revisite Authorization.java" 2021-02-20 19:26:58 +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