Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
626,867 Commits 3 Branches 0 Tags
f52c7481925424d47ac348abfe9a4738b3fd52be
Commit Graph

626867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curtis Belmonte
f52c748192 Add authenticator-aware string methods to BiometricManager 
Adds methods to BiometricManager to return localized strings that may be
used by apps that utilize biometric authentication. These methods should
provide strings that are appropriate for the specific authenticators
that are present on a device and that will actually be used for
authentication in practice. This should alleviate the issue of apps
needing to use overly broad, less user-friendly strings in order to
cover all possible authentication types that may be used.

Test: atest BiometricManagerTest
Test: Manually checked strings using biometric test app

Bug: 162973174
Bug: 180732913
Change-Id: Icd16d8a3b0339e4a963d47e4eb213fa7df83412c
 2021-03-03 13:40:45 -08:00
Remi NGUYEN VAN
0442bbca78 Merge "Move SocketUtils out of the connectivity module" am: 4eb9b18e02 am: b3bc93fbcf am: 1efb1bf4a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9de14464ebb9d43e7c4fdc683c23ddbbcc7ef269
 2021-03-02 19:56:48 +00:00
Chiachang Wang
def97266b5 Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API"" am: 237d2d47a4 am: cc717d3cf9 am: ed5da75243 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607735

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56c9430774d38e7d267da29488b856c635afe496
 2021-03-02 19:56:22 +00:00
Aaron Huang
b6e91d7d56 Merge "Use the net-utils-device-common version of HexDump" am: 93f749b245 am: 1409a78ca6 am: d747ff3d99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3152ffcebf8b51e170cbd70e59c2810c4548d1ca
 2021-03-02 19:55:43 +00:00
Chiachang Wang
9ec3eb7802 Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6 am: 089104cf50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I695ba5ac549800fbf87a8c2a53e1eab86e91d2c3
 2021-03-02 19:55:22 +00:00
Lucas Lin
c966de4129 Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 am: c4432db9e9 am: 5a00e3af70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75c940363940f4c941cc7dc89452bed078396a7e
 2021-03-02 19:55:02 +00:00
Lucas Lin
9cf690d187 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 am: 0fef75ee53 am: e5d40c1933 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54ef9fd59388908f38721671dd26f536fab719bb
 2021-03-02 19:54:22 +00:00
Remi NGUYEN VAN
8d09af0b70 Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: 7152a8f376 am: 045c615bb2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b7416a1d5c8103415246016f43dddc932d0be2b
 2021-03-02 19:53:40 +00:00
Remi NGUYEN VAN
1efb1bf4a8 Merge "Move SocketUtils out of the connectivity module" am: 4eb9b18e02 am: b3bc93fbcf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb9911ad2933d76acbfc8b23463639ffc82bb58b
 2021-03-02 19:52:44 +00:00
TreeHugger Robot
de8097ec8d [automerger skipped] Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: 8c99359559 -s ours am: 6725c98e08 -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I093ad671768d6020662496dbfc866cab6ba384cb
 2021-03-02 19:52:33 +00:00
Chiachang Wang
ed5da75243 Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API"" am: 237d2d47a4 am: cc717d3cf9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607735

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68e07cb3f7d369073d4b05433e1c746bc9277095
 2021-03-02 19:52:30 +00:00
Aaron Huang
d747ff3d99 Merge "Use the net-utils-device-common version of HexDump" am: 93f749b245 am: 1409a78ca6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760
 2021-03-02 19:52:05 +00:00
Chiachang Wang
089104cf50 Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib734109b5f2e6acb26e25e65139890415dfb0bc2
 2021-03-02 19:50:50 +00:00
Lucas Lin
5a00e3af70 Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 am: c4432db9e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff3c3cc14319782e264ed9b4a287b5581e6da90
 2021-03-02 19:50:30 +00:00
Lucas Lin
e5d40c1933 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 am: 0fef75ee53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
 2021-03-02 19:49:13 +00:00
Remi NGUYEN VAN
b3bc93fbcf Merge "Move SocketUtils out of the connectivity module" am: 4eb9b18e02 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2d4b5574ba710eb50c438144e2b87f6c8954336
 2021-03-02 19:48:26 +00:00
Chiachang Wang
cc717d3cf9 Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API"" am: 237d2d47a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607735

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I645df5f6aa6f7a2f56844e81a5c955150065acd3
 2021-03-02 19:44:58 +00:00
Aaron Huang
1409a78ca6 Merge "Use the net-utils-device-common version of HexDump" am: 93f749b245 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1085391b5649df72b6664d5cdf1756c5110287dc
 2021-03-02 19:42:02 +00:00
Soonil Nagarkar
4a245436ce Merge "Move ServiceWatcher into package" into sc-dev 2021-03-02 19:33:49 +00:00
Chiachang Wang
fed4ec6ff6 Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23cce279f53babac5b90364dd4fc0e55eb382dfa
 2021-03-02 19:22:34 +00:00
TreeHugger Robot
4d3a2c4b12 Merge "Override isRestricted for preventing unexpected resource loading" into sc-dev 2021-03-02 19:17:16 +00:00
Lucas Lin
c4432db9e9 Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
 2021-03-02 19:13:55 +00:00
Lucas Lin
0fef75ee53 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51510ea705 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia438f937106645eb0d6cb91772d437676bf716fd
 2021-03-02 19:08:57 +00:00
TreeHugger Robot
2cd9c5126f Merge "Fix crash when using VibratorManagerService before system ready" into sc-dev 2021-03-02 19:07:44 +00:00
TreeHugger Robot
ced14474ce Merge "[pm/incremental] schedule write when loading progress is complete" into sc-dev 2021-03-02 19:04:52 +00:00
TreeHugger Robot
ba1e39dc8f Merge "Fix a bug when uid is removed from temp-allowlist." into sc-dev 2021-03-02 19:01:44 +00:00
Tom Natan
986cee3513 Merge "Add support for loading a static overrides file located in /product." into sc-dev 2021-03-02 18:51:10 +00:00
Remi NGUYEN VAN
045c615bb2 Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: 7152a8f376 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I774c494d6e0f136547cf9175abb6662fd106a6a3
 2021-03-02 18:46:39 +00:00
Darryl Johnson
6796a58373 Merge "Mark requests as active if they don't cause a change in the pending state." into sc-dev 2021-03-02 18:46:37 +00:00
TreeHugger Robot
6725c98e08 [automerger skipped] Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master am: 8c99359559 -s ours 
am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2d2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida26bd98bc676777ac1456dc663ed4ce72d10bb2
 2021-03-02 18:44:20 +00:00
TreeHugger Robot
2190aed87a Merge "Correct rebind to DataLoader after crash/death." into sc-dev 2021-03-02 18:39:54 +00:00
Winson Chiu
90b5c66337 Merge "Accept generic in SparseArray contentEquals" into sc-dev 2021-03-02 18:38:59 +00:00
Eugene Susla
a83cd1fc57 Merge "More logging in CDM discovery service" into sc-dev 2021-03-02 18:20:31 +00:00
Sally Yuen
6996380ef9 Merge "Prefetching can be interrupted by other service requests." into sc-dev 2021-03-02 18:07:56 +00:00
Ryan Mitchell
3381ea741e Merge "Don't use ApkAssets::GetPath for equality checks" into sc-dev 2021-03-02 18:07:06 +00:00
Ryan Mitchell
ef53843630 Don't use ApkAssets::GetPath for equality checks 
With the introduction of ResourcesProviders, not all ApkAssets have
paths on disk. Theme::SetTo and various AssetManager methods use the
path to perform equality checking on ApkAssets. This equality check
will be performed on the debug string of an ApkAssets if it does not
have a path on disk. This causes ApkAssets with the same debug name
(like "<empty>") to be seen as the same ApkAssets. Rather than using
path, the pointer to the ApkAssets should be used for equality checking
since ResourcesManager caches and reuses ApkAssets when multiple
AssetManagers request the same assets.

Bug: 177101983
Test: atest CtsResourcesLoaderTests
Change-Id: I11f6a2a3a7cc8febe3f976236792f78e41cf07e6
 2021-03-02 18:06:49 +00:00
Soonil Nagarkar
766a8d4741 Move ServiceWatcher into package 
Allows for better OWNERS rights and decomposing ServiceWatcher into
multiple pieces.

Bug: 181665909
Test: builds
Change-Id: I63bad4140cf04fb227183bb53b61aeb8fa912f3f
 2021-03-02 09:57:09 -08:00
Lais Andrade
de172a4374 Fix crash when using VibratorManagerService before system ready 
VibratorManagerService depends on some system services like Vibrator,
AudioManager and InputManager, which can only be initialized
onBootPhase.

Move only the initialization of these services to the onBootPhase and
allow the VibratorManagerService to be used before that without
crashing.

Fix: 180699899
Test: VibratorManagerServiceTest
Change-Id: Id6406373d7a7f15265aa6c1ce5b7ef39bb949eed
 2021-03-02 17:42:02 +00:00
Flavio Fiszman
b8d3b7d210 Merge "Stop checking FeatureFlags for People Tile." into sc-dev 2021-03-02 17:39:12 +00:00
Sally Yuen
f6b5277ce2 Merge "Add configurable strength values for Reduce Bright Colors" into sc-dev 2021-03-02 17:38:30 +00:00
Songchun Fan
4bfc84a18b [pm/incremental] schedule write when loading progress is complete 
We don't have an automatic write back in PackageSetting today.
Manually schedule a write when the loading of a package is complete.

Register the progress listener on reboot if a package has not finished
loading before reboot. This will reset the loading progress in the
package setting.

BUG: 181351007
Test: manual and cts test (coming up soon)
Change-Id: Ifea8e1866ce2211025efc20e1da51fff8f57b2aa
 2021-03-02 17:11:38 +00:00
Alex Buynytskyy
e98e2cbdca Correct rebind to DataLoader after crash/death. 
Bug: 180970738
Test: PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I79ef37a69f15774bc92bdfb8eed9b6a98ad24161
 2021-03-02 09:07:28 -08:00
Beth Thibodeau
9a2ae3ed4c Merge "Add documentation for media controls pipeline" into sc-dev 2021-03-02 16:35:50 +00:00
Ying Xu
632686728c Merge "Only show no internet icons when no other network available" into sc-dev 2021-03-02 16:17:12 +00:00
Matt Casey
b7f82de1f1 Merge "Allow MagnifierView to switch sides if the touch input moves" into sc-dev 2021-03-02 15:22:27 +00:00
Matt Casey
f9af66d911 Merge "Make CropView handle images that aren't full-height" into sc-dev 2021-03-02 15:22:19 +00:00
Jerome Gaillard
291b7c00fd Merge "Revert "[incremental] change build rules to not to use aidl_interface"" into sc-dev 2021-03-02 14:50:23 +00:00
Jamie Garside
fcff72ee6e Merge "Update the bouncer to be able to move to either side of a wide screen." into sc-dev 2021-03-02 14:48:30 +00:00
Abhijeet Kaur
5cb9a5453f [automerger skipped] Merge "Removed unused mount mode constants" into rvc-qpr-dev-plus-aosp am: d41a537ed0 -s ours 
am skip reason: Change-Id I62b66083f2099b429474872b6f9c7cffb9fb906d with SHA-1 c8fe3d2acd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56c5f7b73e1e822dd3ddb74f76186324c939c252
 2021-03-02 14:33:33 +00:00
TreeHugger Robot
f51c6d573e Merge "Introduce a flag to let app get global insets state" into sc-dev 2021-03-02 13:55:31 +00:00