Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,449 Commits 3 Branches 0 Tags
b4630c8743cdbfea17543ce854fdb9301076ac28
Commit Graph

651449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kriti Dang
b4630c8743 Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd88a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14840460

Change-Id: Ie9d1c4e039ce547eca7f3e427fa80a6fc08a963d
 2021-07-16 08:16:33 +00:00
Kriti Dang
0077afd88a Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev 2021-07-16 08:03:05 +00:00
Chris Li
fa3e41dd25 Merge "Clean up previous DA organizer when registering" into sc-dev am: e032c8face 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15106415

Change-Id: Ifcafa406b33b534bcea0319437fa8d4be2e1f233
 2021-07-16 07:16:05 +00:00
Chris Li
e032c8face Merge "Clean up previous DA organizer when registering" into sc-dev 2021-07-16 06:53:18 +00:00
Tony Huang
3e2af07fda Merge "Prevent having empty task added back into TDA" into sc-dev am: f4690485e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15298116

Change-Id: I8ff2422f834c0f62547079075fc06a64e0e6c411
 2021-07-16 06:00:29 +00:00
TreeHugger Robot
29cd6f010f Merge "Make ImePerfTest wait for animation end" into sc-dev am: 28a77d5846 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161272

Change-Id: I525cc71e8f612fdf37722a7a085c47adb245a8a3
 2021-07-16 05:59:50 +00:00
Tony Huang
f4690485e1 Merge "Prevent having empty task added back into TDA" into sc-dev 2021-07-16 05:56:08 +00:00
TreeHugger Robot
28a77d5846 Merge "Make ImePerfTest wait for animation end" into sc-dev 2021-07-16 05:40:45 +00:00
Ming-Shin Lu
d0c274537d Merge "Using WindowInsets API to hide keyboard on LockScreen when screen-off" into sc-dev am: efda0f9277 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287621

Change-Id: Iaf0deb0735c34d6480e09d1a62e8ac9020950274
 2021-07-16 05:05:00 +00:00
Ming-Shin Lu
efda0f9277 Merge "Using WindowInsets API to hide keyboard on LockScreen when screen-off" into sc-dev 2021-07-16 04:51:23 +00:00
Benedict Wong
ee52376594 Merge "Limit VCNs to one running at a given time" am: 9e6e3ce643 am: 4d16027790 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767050

Change-Id: I89be4b61ec4e3a7ed24b817acf52a9c58fb5b4f2
 2021-07-16 03:27:31 +00:00
Benedict Wong
4d16027790 Merge "Limit VCNs to one running at a given time" am: 9e6e3ce643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767050

Change-Id: I4add4dc57ac3c49ebd66da460dd42f54f880d079
 2021-07-16 03:05:30 +00:00
Benedict Wong
9e6e3ce643 Merge "Limit VCNs to one running at a given time" 2021-07-16 02:48:06 +00:00
Dmitri Plotnikov
c37c2ba216 Merge "Fix BatteryStatsImplTest." into sc-dev am: 4162c032bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15291010

Change-Id: Ib21cd08963534c6622d095c0b3d6b7ebc4a97bcc
 2021-07-16 00:48:02 +00:00
Dmitri Plotnikov
4162c032bf Merge "Fix BatteryStatsImplTest." into sc-dev 2021-07-16 00:26:16 +00:00
TreeHugger Robot
f315248441 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6b1ec169e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81107da4ab4a2c6b5d3888225782cc09778dd696
 2021-07-15 23:54:05 +00:00
TreeHugger Robot
6b1ec169e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 23:44:12 +00:00
John Reck
c1d7f44952 Merge "Adjust declared usage for createHardwareBitmapFromRenderNode" into sc-dev am: 53c02ec9fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301830

Change-Id: I93cd095c311b572a475a36df6feda21c31757d68
 2021-07-15 23:34:46 +00:00
John Reck
53c02ec9fd Merge "Adjust declared usage for createHardwareBitmapFromRenderNode" into sc-dev 2021-07-15 23:32:01 +00:00
Beverly Tai
92c260413e Merge "Revert "Animate in a background for kg unlock icon"" into sc-dev am: dea99bf55e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302787

Change-Id: Iec625f9ddd78fac0eee978a7829567e151af9d28
 2021-07-15 23:31:28 +00:00
Beverly Tai
dea99bf55e Merge "Revert "Animate in a background for kg unlock icon"" into sc-dev 2021-07-15 23:07:38 +00:00
Beth Thibodeau
b8abde227f Merge "Always show lockdown button" into sc-dev am: 04697f8263 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15289457

Change-Id: If7727c66c823f44bcf28a20f07915069bfc92060
 2021-07-15 22:54:20 +00:00
Beth Thibodeau
04697f8263 Merge "Always show lockdown button" into sc-dev 2021-07-15 22:44:24 +00:00
TreeHugger Robot
514d9a6908 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2db6435bb2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf1b1d5eb59138d75f2107590cecd54daead5ddb
 2021-07-15 22:24:44 +00:00
Treehugger Robot
13a7267038 [automerger skipped] Merge "Avoid sampling outside BQ crop rect" am: 4fd405dfe7 am: 55bf147f6a -s ours 
am skip reason: Merged-In I2910d93471f08aaf807ac9f87fdf84cf29cf4143 with SHA-1 0f284da923 is already in history

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

Change-Id: I5bde8980958c3ed6bb4616e1bb189f4bdb3b41a5
 2021-07-15 22:20:38 +00:00
TreeHugger Robot
2db6435bb2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 22:09:50 +00:00
Treehugger Robot
55bf147f6a Merge "Avoid sampling outside BQ crop rect" am: 4fd405dfe7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768168

Change-Id: Ifbfc59fed8e28cd5e2f4ca165e582f4031381b8f
 2021-07-15 22:06:28 +00:00
TreeHugger Robot
42bb552228 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a291f2da1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fa3b100efee6ad44ebacb1a88560bcfdea9b308
 2021-07-15 21:56:51 +00:00
Beverly Tai
266e0b864f Revert "Animate in a background for kg unlock icon" 
This reverts commit 09923d5eca.

Reason for revert: doesn't look good on smaller devices, punting to qpr
Bug: 192403524
Change-Id: I3e6bde6cf2f8cbbeb3502444cd63f2933704d357
 2021-07-15 21:56:39 +00:00
TreeHugger Robot
a291f2da1d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 21:52:00 +00:00
Dmitri Plotnikov
21dd5325fb Fix BatteryStatsImplTest. 
Bug: 180015146
Test: atest FrameworksCoreTests:BatteryStatsImplTest

Change-Id: I6b43ca03ba816e12735ebd47d8cf61a6b1cee110
 2021-07-15 14:51:18 -07:00
TreeHugger Robot
0ac2e636ad Merge "Add guards around unbind" into sc-dev am: e2b3bf94c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301093

Change-Id: I112f10639c5d3eb8270c8eb376b6c0548efd4ccf
 2021-07-15 21:50:12 +00:00
TreeHugger Robot
e2b3bf94c5 Merge "Add guards around unbind" into sc-dev 2021-07-15 21:39:20 +00:00
TreeHugger Robot
d003c77da4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31d54d9a3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b4a816c9858b762b8403d3d9e0e88212d244dec
 2021-07-15 20:35:46 +00:00
Beverly Tai
35d2c1ffa9 Merge "Add haptic feedback on the kg lock icon" into sc-dev am: 025380e2b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301522

Change-Id: I3afea9b35e85fb27d7c653e8835700f48f861c97
 2021-07-15 20:34:47 +00:00
TreeHugger Robot
31d54d9a3b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 20:22:37 +00:00
Beverly Tai
025380e2b2 Merge "Add haptic feedback on the kg lock icon" into sc-dev 2021-07-15 20:19:20 +00:00
TreeHugger Robot
db76aaaa6c Merge "Disable mic/cam quicksettings tiles when admin disallows" into sc-dev am: 0473e3a8e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15084815

Change-Id: I552e8709fe38b8f8b47b4e5714140787cd66bc27
 2021-07-15 20:05:56 +00:00
Treehugger Robot
4fd405dfe7 Merge "Avoid sampling outside BQ crop rect" 2021-07-15 19:59:11 +00:00
TreeHugger Robot
0473e3a8e0 Merge "Disable mic/cam quicksettings tiles when admin disallows" into sc-dev 2021-07-15 19:52:50 +00:00
Bill Yi
5dfcf9cf03 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I44c2982e57c1df15755bc394ef5adebf5d9e4fb2
 2021-07-15 19:45:59 +00:00
Santos Cordon
c173e95670 Merge "Tests for HighBrightnessModeController's HDR mode" into sc-dev am: e3e3a319e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235803

Change-Id: If7fb94bfe6266c2a59a49316a0fe05f6b7805bc9
 2021-07-15 19:34:07 +00:00
TreeHugger Robot
6a12d1bf14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0d57ba415a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0fd17606e193ef8a5017167b7b7bf681c9c68ff
 2021-07-15 19:33:56 +00:00
TreeHugger Robot
5b463f9b14 Merge "Tuner APIs: add locks to avoid crashes caused by NPE" into sc-dev am: d7d85eb143 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15290582

Change-Id: Id2beb939a4df428b438a0cae2df63f731faad2a0
 2021-07-15 19:33:29 +00:00
Beverly Tai
6605f0d148 Merge "Dismiss keyguard on udfps touch if can dismiss LS" into sc-dev am: 45877fb8a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15290813

Change-Id: Iae13ed56574a9f190a7aa88aa8ac091eaf56b33f
 2021-07-15 19:32:46 +00:00
Fabian Kozynski
95a0a7ffa4 Add guards around unbind 
Also, make sure that mIsBound is in the correct state and clean up after
death.

Test: atest TileServiceTest for the leaks
Test: atest TileLifecycleManagerTest
Fixes: 183807631
Change-Id: I8fa2b746d9ba273bcbef088e4ca4ba50a317128a
 2021-07-15 15:24:28 -04:00
Santos Cordon
e3e3a319e6 Merge "Tests for HighBrightnessModeController's HDR mode" into sc-dev 2021-07-15 19:06:49 +00:00
Benedict Wong
3433a8e5d9 Limit VCNs to one running at a given time 
This change ensures that there is only ever one VCN running at a given
point in time, and that if the device has switched to using a
subscription in a different subscription group, the VCN will immediately
tear down.

This ensures that when on a DSDS device, when the VCN-enabled
subscription is not the default/active subscription, the other
subscription's network will never be outscored by the VCN, and thus get
torn down.

Bug: 190761448
Test: atest FrameworksVcnTests
Test: Manual testing to ensure common functionality
Change-Id: I8031fab7502880d38420058451df41f47567c458
 2021-07-15 12:04:05 -07:00
TreeHugger Robot
0d57ba415a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-15 19:00:41 +00:00
TreeHugger Robot
d7d85eb143 Merge "Tuner APIs: add locks to avoid crashes caused by NPE" into sc-dev 2021-07-15 18:59:10 +00:00