drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
616,418 Commits 1 Branch 0 Tags
Commit Graph

616418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
618d5b46db Merge "Fix biometrics bug of mismatched data types." 2020-12-22 18:59:31 +00:00
Jiabin Huang
a6421faaac Support set/clear/get preferred device for capture preset. 
Support set/clear/get preferrd device for capture preset. The preferred
device will be used for audio routing when it is availabled. The
preferred device doesn't need to be present when setting.

Bug: 160352965
Test: atest AudioServiceTest
Test: atest AudioServiceHostTest
Test: atest CarAudioZonesHelperTest

Change-Id: Ib7aa142ad4c56a8138c7b440e8efbbf7a7ee38a6
Merged-In: Ib7aa142ad4c56a8138c7b440e8efbbf7a7ee38a6
 2020-12-22 18:54:15 +00:00
JW Wang
727dc4d300 Fix ApexManager#snapshotCeData (3/n) 
Now it returns a boolean to indicate if the snapshot was successful or
not since we no longer use inode to delete snapshots.

Bug: 154897348
Test: atest RollbackUnitTest RollbackStoreTest AppDataRollbackHelperTest
Merged-In: I10ed0e3adef88a27ee239c183d99a836b623d0d1
Change-Id: I10ed0e3adef88a27ee239c183d99a836b623d0d1
(cherry picked from commit 6d8e4e5a409fcff89b68e635cd87baf8b7974cf9)
 2020-12-22 18:52:04 +00:00
Eugene Susla
7e37883244 Don't require MANAGE_ROLE_HOLDERS when removing CDM associatons 
Test: manual, using a test app
Fixes: 176133554
Change-Id: Iaeb2eee9936c3ebd8772ad3c8790b3c592b2e401
 2020-12-22 10:33:03 -08:00
David Su
0ff98ba6a6 FrameworksWifiNonUpdatableApiTest: make APK package name unique 
Package name collisions may cause presubmit errors.

Bug: 176105484
Test: presubmit
Change-Id: If8149f3027d4ae0d5cdd3da505d31ac2d098df31
 2020-12-22 10:27:31 -08:00
Daniel Chapin
c63a640587 Merge "Revert "Added update device info playback configuration"" 2020-12-22 18:10:43 +00:00
David Su
9548db78b0 frameworks/base/wifi: Move migration_samples to non-updatable directory 
This is not part of the Wifi module, move it to the non-updatable
directory.

Bug: 176105484
Test: compiles
Merged-In: Ia95e300da9286d79ee57c285c3bfa88ecc98e326
Change-Id: I495b3edc6e7a6bbb7bae287e8bdd88243e72da70
 2020-12-22 18:07:34 +00:00
David Su
e0e31770cd frameworks/base/wifi: Move migration_samples to non-updatable directory 
This is not part of the Wifi module, move it to the non-updatable
directory.

Bug: 176105484
Test: compiles
Merged-In: Ia95e300da9286d79ee57c285c3bfa88ecc98e326
Change-Id: I94cced501d7ffc2602b7672fa10999b1a1a8e5f6
 2020-12-22 18:02:26 +00:00
Benjamin Schwartz
f17961cdd3 Merge "KernelWakelockReader: provide class level lock when updates staleStats" am: b9f60a53c3 am: ec13727383 am: 7805396ee6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ef1ab620b8a56e62c295d081f714de208d9fa57
 2020-12-22 17:39:58 +00:00
Treehugger Robot
67fb6f51fa [automerger skipped] Merge "Split updatable/non-updatable Wifi APIs into separate directories" am: b8b8a392f3 am: 7cd4021230 am: 737529ea94 -s ours 
am skip reason: Change-Id Ia95e300da9286d79ee57c285c3bfa88ecc98e326 with SHA-1 e7cc3ae663 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie61262ddf5de547fd0606029ecbaed5182adc45e
 2020-12-22 17:39:38 +00:00
Benjamin Schwartz
7805396ee6 Merge "KernelWakelockReader: provide class level lock when updates staleStats" am: b9f60a53c3 am: ec13727383 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32722ae3a7f5fbde2aa7d42402f8f2d670423f4b
 2020-12-22 17:38:56 +00:00
Eric Laurent
c407689f12 [automerger skipped] Merge "Introduce device(s) role for strategy." am: 7f73ba815a am: c24c3af89d am: 6bacac852a -s ours 
am skip reason: Change-Id I2ba02c6b50af80846a25010ead05c4ae364868de with SHA-1 f40141ddbc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0e37c319c3099aefc84c6a0094bfb1828c013ad
 2020-12-22 17:38:50 +00:00
Eric Laurent
b85dd50694 Merge "audio: modify media JNI and audio service test OWNERS" am: 70544c6a7b am: 1f4fff0881 am: 5ed16d5baa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8da504252eb4f7059c55981299c6c639df72ce31
 2020-12-22 17:38:13 +00:00
Greg Kaiser
8ce575b256 Revert "Fix permission on TM#isDataEnabled" 
This reverts commit f7dc3f6788d6ca53663d457a545b9de880e3cf02.

Reason for revert: b/176163590, continual fatal exceptions in telephony on reboot
Bug: 176163590
Test: Local revert and the fatal exceptions go away

Change-Id: If7cbe3e5b8764f0ee72985830880157f64d71101
 2020-12-22 17:35:44 +00:00
Benjamin Schwartz
ec13727383 Merge "KernelWakelockReader: provide class level lock when updates staleStats" am: b9f60a53c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534034

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4eb5e35e166e9578351b11b565136a68ce8b31f
 2020-12-22 17:33:17 +00:00
Treehugger Robot
737529ea94 Merge "Split updatable/non-updatable Wifi APIs into separate directories" am: b8b8a392f3 am: 7cd4021230 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6afa3134eec13cd72f777c4f0e33bb579eb58177
 2020-12-22 17:26:50 +00:00
Eric Laurent
6bacac852a Merge "Introduce device(s) role for strategy." am: 7f73ba815a am: c24c3af89d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534429

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id31f00d038a87383f5a5ee6e4ba0d02baff0e31a
 2020-12-22 17:26:34 +00:00
Riddle Hsu
fa209a7178 Use rotated bounds as source touchable region for rotated app 
The Layer in SF side will transform the given touchable region
according to the transformation matrix of surface. So if a window
is rotated, the raw touchable region should be the rotated bounds
instead of the bounds in display space. Then the raw region can
be rotated to the correct orientation. Otherwise the region is
like being rotated twice.

Bug: 175849666
Test: WindowStateTests#testUpdateInputWindowHandle
Change-Id: I266aaa21651c0bd5964e99d755382933d1336a9c
 2020-12-23 01:26:19 +08:00
Eric Laurent
5ed16d5baa Merge "audio: modify media JNI and audio service test OWNERS" am: 70544c6a7b am: 1f4fff0881 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d56196500190868fbbbcbe395e04047a2be909e
 2020-12-22 17:25:37 +00:00
Benjamin Schwartz
b9f60a53c3 Merge "KernelWakelockReader: provide class level lock when updates staleStats" 2020-12-22 17:24:34 +00:00
Treehugger Robot
7cd4021230 Merge "Split updatable/non-updatable Wifi APIs into separate directories" am: b8b8a392f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533682

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c1b49f0eb2e8162304de28fcaf0380ddfc48ceb
 2020-12-22 17:21:32 +00:00
Beverly Tai
a358a92abd Merge "Disable FaceAuthScreenBrightnessController" 2020-12-22 17:21:30 +00:00
Eric Laurent
c24c3af89d Merge "Introduce device(s) role for strategy." am: 7f73ba815a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534429

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02c0c5535e42c5a26ee94c3bde86920b5cb22b69
 2020-12-22 17:18:54 +00:00
Treehugger Robot
b8b8a392f3 Merge "Split updatable/non-updatable Wifi APIs into separate directories" 2020-12-22 17:14:28 +00:00
Eric Laurent
7f73ba815a Merge "Introduce device(s) role for strategy." 2020-12-22 17:11:45 +00:00
Jeff Sharkey
965d845ef1 Fix biometrics bug of mismatched data types. 
They're writing a "long" value, but attempting to read it back as
an "int" risks losing precision; they need to read as a "long".

Bug: 176144163
Test: manual
Change-Id: I23bca4ebfb38f27ce640d52ec737375c3e1f4ab5
 2020-12-22 10:11:27 -07:00
Bernardo Rufino
b0f1c52581 Merge "Add '--no-kill' option to 'adb shell am compat'" 2020-12-22 16:57:19 +00:00
Eric Laurent
1f4fff0881 Merge "audio: modify media JNI and audio service test OWNERS" am: 70544c6a7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic117599e1b3ed79d387948210b65735c5ed52567
 2020-12-22 16:54:47 +00:00
David Su
fe8ec511b6 [automerger skipped] Split updatable/non-updatable Wifi APIs into separate directories am: 4e461c5a9f -s ours 
am skip reason: Change-Id Ia95e300da9286d79ee57c285c3bfa88ecc98e326 with SHA-1 e7cc3ae663 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20d7913d7127a12b44bd5b4a71a2f65375fd1534
 2020-12-22 16:53:38 +00:00
Eric Laurent
70544c6a7b Merge "audio: modify media JNI and audio service test OWNERS" 2020-12-22 16:29:47 +00:00
Beverly
941719afde Remove unnecessary broadcast receiver 
Test: manual, atest SystemUITests
Fixes: 175038174
Change-Id: I91354022ae524a3656f41ab45b4a5f426527624a
 2020-12-22 11:22:10 -05:00
Beverly Tai
2e344a1e00 Merge "Replace UDFPS circle with FP icon" 2020-12-22 16:17:31 +00:00
TreeHugger Robot
ba2a484b35 Merge changes I90ef1251,I0e93d5e7 
* changes:
  Add owners for power stats jni code
  Add PowerStats HAL 1.0 support
 2020-12-22 16:17:10 +00:00
Beverly Tai
3c36c16ff6 Merge "Only show lock icon on devices using faceauth" 2020-12-22 16:16:50 +00:00
Adam Wright
c3060eae38 Revert "Prefetching can be interupted by other service requests." 
This reverts commit 103dd32a74f9962e41499b4a39b15b32e963ce65.

Reason for revert: Looking for culprits for b/176078134

Change-Id: I1e2524411fcc91a2c212d4ee5a0f5b74cac0bda4
 2020-12-22 16:06:09 +00:00
Bernie Innocenti
f896d460d1 Merge "Add explicit Result::ok() where missing" 2020-12-22 15:53:59 +00:00
Beverly
71666e9959 Add logs to NextAlarmController 
Test: adb shell dumpsys activity service com.android.systemui
Bug: 175360001
Change-Id: I920e2b65e0fa828a5c74154b7a50724b75c514e0
 2020-12-22 10:49:55 -05:00
Lyn Han
7d2c5b53e2 Merge "Label ExpandableNotificationRow for hierachy snapshot viewer" 2020-12-22 15:14:18 +00:00
Lyn Han
c3481cd657 Merge "Remove unused shelf state" 2020-12-22 15:13:22 +00:00
Jin Seok Park
0cac9b6f0b Add support for reading XMP from HEIF 
Bug: 159373092
Test: atest CtsMediaTestCases:android.media.cts.ExifInterfaceTest
Change-Id: Ia595ffd3eb4099ba3d0f3edb79008801b205cbee
 2020-12-22 23:46:54 +09:00
Ulyana Trafimovich
ba55b56838 Merge "Disable dexpreopt and <uses-library> check for "framework-res"." 2020-12-22 14:37:43 +00:00
Alan Stokes
5200c2c86b Merge "Disable CE access checking for canAccessDataDir." 2020-12-22 14:23:26 +00:00
Eric Laurent
9c2bace739 audio: modify media JNI and audio service test OWNERS 
Add OWNERS file to services/tests/servicestests/src/com/android/server/audio
and add jmtrivi@google.com to media owners file.

Test: N/A
Change-Id: If446eb3f2de07ab1cb3e87715b964a9360ec684c
 2020-12-22 15:16:46 +01:00
Ulya Trafimovich
bdf786e99d Disable dexpreopt and <uses-library> check for "framework-res". 
Dexpreopt is not needed as "framework-res" contains no code.

Bug: 132357300
Test: treehugger
Change-Id: I235292292b47a04160bf85105a1a43421e94e244
 2020-12-22 12:51:52 +00:00
Anton Hansson
6080e03adf Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb am: ab3f2d3aba am: 81bfcb40a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814572df3ea32202a9f348901143d0b244dad56f
 2020-12-22 12:34:57 +00:00
Eric Laurent
379446ed6b [automerger skipped] Merge "Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>" am: 8fe2d292b0 am: 1cc2a1f6ef am: 7c9599f917 -s ours 
am skip reason: Change-Id Ib48056d6c332ae5eb006e0e12a80c8505c7313d8 with SHA-1 0b5532967d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60d4c7cea8e47da4da0852f951bb11070452762c
 2020-12-22 12:34:23 +00:00
Anton Hansson
81bfcb40a3 Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb am: ab3f2d3aba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I735487ab19a1396dae84592a065a9b507395cc0d
 2020-12-22 12:13:25 +00:00
Eric Laurent
7c9599f917 Merge "Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>" am: 8fe2d292b0 am: 1cc2a1f6ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534428

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5e6575ff20a6a00205576e7b433c0729db5d31e
 2020-12-22 12:13:06 +00:00
Anton Hansson
ab3f2d3aba Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bc055137068db530aa29c1797bb27ea8a93f539
 2020-12-22 11:47:40 +00:00
Eric Laurent
1cc2a1f6ef Merge "Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>" am: 8fe2d292b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534428

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cbca8e20fb67190212eb3351212f6efa7e826f4
 2020-12-22 11:46:12 +00:00