Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
631,103 Commits 3 Branches 0 Tags
d9cc54dfd35de60bb0f51e321fc47d2d37b897b7
Commit Graph

631103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu
d9cc54dfd3 Revert "UserController: avoid misleading log messages about failed to find key" 
This reverts commit b0a72e2253.

Reason for revert: b/183786247. It breaks resume on reboot & block droidfood

Change-Id: Id4170c7050d34d0289183e606718ad0e2ea58529
 2021-03-30 19:42:53 +00:00
Eric Biggers
b0a72e2253 UserController: avoid misleading log messages about failed to find key 
If a user's CE storage requires a credential token to unlock, then
there's no need to try to unlock it without one.

This avoids logging some misleading error messages on every boot, like:

    E vold    : Failed to read from /data/misc/vold/user_keys/ce/0/current/keymaster_key_blob: No such file or directory
    E vold    : Failed to find working ce key for user 0
    E vold    : Couldn't read key for 0

Bug: 146206679

Test: atest com.android.server.am.UserControllerTest
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testResetPasswordWithToken

      Also a manual test: booted device that has a PIN.  Verified that
      the misleading log messages are no longer present.  Unlocked
      device, then removed the PIN and rebooted.  Verified that the
      device was then automatically unlocked as expected.

Change-Id: I5652a417727553f10a39eb97fc04cc5116b81347
 2021-03-22 16:05:54 +00:00
Matt Casey
abe60b3500 Merge "Update long screenshot crop per mocks" into sc-dev 2021-03-22 15:50:19 +00:00
TreeHugger Robot
b7f42702dc Merge "Fix revokePermissionsNoLongerImplicitLocked() for shared UIDs." into sc-dev 2021-03-22 15:49:23 +00:00
TreeHugger Robot
2357d702d7 Merge "Fix all runtime permissions being considered changing protection from non-runtime on first boot." into sc-dev 2021-03-22 15:49:13 +00:00
Treehugger Robot
d9929deede [automerger skipped] Merge "Remove reference of getActiveLinkproperties" am: 79ddf1afb8 am: fc25cb26f9 am: 7f7751db58 -s ours 
am skip reason: skip tag Change-Id Ic0e895c77cf3efb78ddc333c4f3b1016cebcfe17 with SHA-1 1bb3f75b05 is already in history

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

Change-Id: Ia4b2f164688c650dd65f8f9858718e4674a121f6
 2021-03-22 15:33:57 +00:00
TreeHugger Robot
211d840082 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9941d8e007 -s ours am: ea7be3a489 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee59f18edb39a645f3fde85162e3a3ccae4813e8
 2021-03-22 15:33:38 +00:00
Jan Tomljanovic
2eb7e4f948 Merge "Add permission for avoiding toast rate limiting." into sc-dev 2021-03-22 15:29:52 +00:00
Song Hu
c24be7e653 Merge "Surface DS targets as per their own score and ranking, remove customized ranking logic (max shortcuts count limit per app, app share adjustment). This is guarded by the flag "apply_sharing_app_limits_in_sysui"." into sc-dev 2021-03-22 15:26:20 +00:00
Treehugger Robot
7f7751db58 Merge "Remove reference of getActiveLinkproperties" am: 79ddf1afb8 am: fc25cb26f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645299

Change-Id: I6ab8cba01e409686202d046dae22658face9d06b
 2021-03-22 15:09:39 +00:00
Paul Hu
c6c7448499 Merge "Fix CS external dependencies on SystemUI" into sc-dev 2021-03-22 15:04:50 +00:00
Blake Kragten
dd33639b16 Merge "Add GnssPowerStats Metrics" into sc-dev 2021-03-22 15:04:03 +00:00
Jeff DeCew
d4fcc94923 Merge "Add BigPictureStyle.bigPicture(Icon)" into sc-dev 2021-03-22 14:56:53 +00:00
Bill Yi
2c946706fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16ff991edd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic17fc3e5ae5e69b5475be663a6f8fd6bed499c71
 2021-03-22 14:51:43 +00:00
TreeHugger Robot
ea7be3a489 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9941d8e007 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43364bcaa129eee2c2e7be575cdc04da4a728a7b
 2021-03-22 14:47:54 +00:00
Remi NGUYEN VAN
92fb581d50 Merge "Remove ConnectivityService hidden annotations" into sc-dev 2021-03-22 14:41:51 +00:00
Riddle Hsu
bee1f1811b Merge "Transfer launch cookie for consecutive launch" into sc-dev 2021-03-22 14:29:05 +00:00
Treehugger Robot
fc25cb26f9 Merge "Remove reference of getActiveLinkproperties" am: 79ddf1afb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645299

Change-Id: I8a16f71a21a9bdc2c9195a999491b9ee09b35f95
 2021-03-22 14:18:35 +00:00
TreeHugger Robot
ce87fc2b8b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-22 14:13:31 +00:00
TreeHugger Robot
9941d8e007 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-22 14:03:49 +00:00
Treehugger Robot
79ddf1afb8 Merge "Remove reference of getActiveLinkproperties" 2021-03-22 13:39:40 +00:00
Treehugger Robot
69cd06014d Merge "Make isDataCapable a public API" am: 965d021bf5 am: abed1c46be am: 1d40d06532 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275

Change-Id: I8b83100d8d3945538b8fee0860bcf1d7cbbcaa91
 2021-03-22 13:25:10 +00:00
Jack Nudelman
60a2143239 Merge "Add capability for thermal mitigation." am: 1cc1558ea6 am: 75c0c02fd4 am: f727323567 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621704

Change-Id: I703c16f9d1ecaa5041072114b112600fcad92eff
 2021-03-22 13:24:05 +00:00
Chiachang Wang
6537da5e2f Merge "Add NetworkRequest.Builder creating from an existing instance" into sc-dev 2021-03-22 13:17:43 +00:00
Song Hu
64515ec80b Surface DS targets as per their own score and ranking, remove customized ranking logic (max shortcuts count limit per app, app share adjustment). 
This is guarded by the flag  "apply_sharing_app_limits_in_sysui".

Bug: 182146792
Test: verify on local phone
Test: atest ChooserActivityTest
Change-Id: Ic03395343432015400f37299e5748932d2bd9eaa
Merged-In: Ic03395343432015400f37299e5748932d2bd9eaa
(cherry picked from commit d001e08b92)
 2021-03-22 13:09:13 +00:00
Chiachang Wang
26ab6df3c8 Add NetworkRequest.Builder creating from an existing instance 
Provide a formal way to construct a new NetworkRequest from an
existing instance. The network capabilities inside the
NetworkRequest is hidden. There is no way to pass a
NetworkRequest and update its capabilities. Add
NetworkRequest.Builder creating from an existing instance to
allow to clone the network capabilities.

Bug: 172183305
Test: make update-api
Change-Id: I068462b2a1410daf67b0c95f2b643d396f079531
CTS-Coverage-Bug: 172183305
 2021-03-22 13:05:10 +00:00
Song Hu
7e53b6437a Merge "Remove append/quota mechanism from direct share target surfacing, due to ChooserTargetSevice sunset." into sc-dev 2021-03-22 13:04:30 +00:00
Kholoud Mohamed
1ee4a4ecba Merge "Remove no longer needed QUERY_USERS permission" into sc-dev 2021-03-22 13:00:37 +00:00
Treehugger Robot
1d40d06532 Merge "Make isDataCapable a public API" am: 965d021bf5 am: abed1c46be 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275

Change-Id: Ic06e74f162937597af19e3b44fc337d920f5f635
 2021-03-22 12:42:28 +00:00
Jack Nudelman
f727323567 Merge "Add capability for thermal mitigation." am: 1cc1558ea6 am: 75c0c02fd4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621704

Change-Id: If33c887416324e234c33dd42e9b8eeef659f7322
 2021-03-22 12:42:10 +00:00
Lorenzo Colitti
30c71e6288 Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816 am: 3c975c208f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972

Change-Id: I0420784d706f64b05137074bfcfb58cdc232b83b
 2021-03-22 12:34:17 +00:00
Chiachang Wang
38f4abd6b3 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd40748 -s ours am: 0e1deb1520 am: 67ab7d7eb0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005

Change-Id: I0317175e5c25616addd0b651d48ce47d61503f00
 2021-03-22 12:33:45 +00:00
Treehugger Robot
8ed5c55633 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b3961 -s ours am: 64169ae2a1 am: c000e91047 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640144

Change-Id: I52d135904ffc8cb4aae0166deb7bfaedc969a583
 2021-03-22 12:33:19 +00:00
Remi NGUYEN VAN
0f71cd372f [automerger skipped] Merge "Remove Preconditions usage in TestNetworkSpecifier" am: 1077770f78 am: f0ae748bf5 am: 7a966d4355 -s ours 
am skip reason: skip tag Change-Id I3f722075fb9c74e12e40348ba4faad2f0fa67178 with SHA-1 f790404d2f is already in history

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

Change-Id: I26d0bb14c35b17086f66a4dfc6d7f727d9940cf2
 2021-03-22 12:32:55 +00:00
Remi NGUYEN VAN
0cbd0b8ae0 [automerger skipped] Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: 9cb39acfef am: e3a7e8d8a5 am: 018b3a1b3b -s ours 
am skip reason: skip tag Change-Id I3a67d266b32142c034520acbcdc30f7213db5e13 with SHA-1 37703094fd is already in history

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

Change-Id: I2d568af3f71ae143c535090487b0b85754421fa6
 2021-03-22 12:32:34 +00:00
Automerger Merge Worker
72684e63c9 Merge "Merge "Add TEST_MAPPING for Connectivity" am: 2ff7a8e1b3 am: 9329f9fe97 am: 9098dddd79" into sc-dev 2021-03-22 12:32:25 +00:00
Remi NGUYEN VAN
7063b2b945 Merge "Remove hidden Icon.createWithResource API usage" into sc-dev 2021-03-22 12:32:22 +00:00
Remi NGUYEN VAN
237ff2c570 Merge "Add TEST_MAPPING for Connectivity" am: 2ff7a8e1b3 am: 9329f9fe97 am: 9098dddd79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646851

Change-Id: Iab1ad1723dd4cb4d4652b23d8499c0b05deca7ad
 2021-03-22 12:32:08 +00:00
Treehugger Robot
b6eba34732 Merge "Move trimV4AddrZeros to libs/net" am: 405801f0fc am: 4e688a6cb7 am: 7fd39d2852 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636022

Change-Id: I7908772ff2f3b2c5fc1dd9a3510fce0f7ee78ba5
 2021-03-22 12:31:39 +00:00
Remi NGUYEN VAN
06bca53163 Merge "Add SystemMessages protos to Connectivity" am: 805b39b2d9 am: bd85dbeb41 am: 898073e357 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626204

Change-Id: Ia8a06a0d6f5dcdbdc672149ff206aada83478f23
 2021-03-22 12:31:07 +00:00
Jayachandran Chinnakkannu
24f9e168ad Merge "Swap parameters in QosCallback#registerQosCallback" am: bc71009366 am: cd9b3e06c2 am: 2e744846a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628901

Change-Id: Ice84bb2e6d855ed88e7e432cf49739e69c9e01de
 2021-03-22 12:30:40 +00:00
Treehugger Robot
db77ba6c0e Merge "Add new @SystemApi for specifying AddressType and IRK" am: bf516b9e11 am: 6ec4bd694b am: 48107ad1a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641559

Change-Id: Id8342097bc9fa720151a621342eab4d4813e0644
 2021-03-22 12:30:16 +00:00
SongFerng Wang
943570dc8e [automerger skipped] Merge "The phone didn't reload the allowed Network Type" am: cfa02cd687 am: 3dd9c6bf01 am: 935980c740 -s ours 
am skip reason: skip tag Change-Id Icfffea3c74ecf6938455d841da9d6175f6aa07de with SHA-1 a71b2c613c is already in history

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

Change-Id: I875637d1c8cf3555f04bb29063a677cb5a6fb85e
 2021-03-22 12:29:13 +00:00
Roshan Pius
45b473c04f [automerger skipped] resolve merge conflicts of 403b7fd0b0 to stage-aosp-master am: fdc5eb6e56 am: efd2d89db8 -s ours 
am skip reason: skip tag Change-Id Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3 with SHA-1 00617edb46 is already in history

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

Change-Id: I945ee90092cf1f8001a92b72a66373d92fbcd326
 2021-03-22 12:28:37 +00:00
tim peng
da6e3628e6 Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev am: a6b0836e95 am: 1ff4cc3ff2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13755425

Change-Id: Ib73fe42405a95cd974776859a618a89f480ad4cb
 2021-03-22 12:28:19 +00:00
Automerger Merge Worker
3e0ec047dd Merge "[automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: b0c6107723 -s ours am: 964605dc23 -s ours am: 881130bd85 -s ours" into sc-dev 2021-03-22 12:28:15 +00:00
Charles Chen
b661dcbda6 Merge "Enable to listen to WindowContext's config changes" into sc-dev 2021-03-22 12:28:02 +00:00
Chiachang Wang
30e7707029 [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: b0c6107723 -s ours am: 964605dc23 -s ours am: 881130bd85 -s ours 
am skip reason: skip tag Change-Id I107c329d4d7130d488772166eae8b5e7aaa2ff04 with SHA-1 8f2f98f880 is already in history

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

Change-Id: I9986ddce8827a85982b0846e18044fc45ec95c24
 2021-03-22 12:28:01 +00:00
Lorenzo Colitti
fe7b39264b [automerger skipped] Merge changes from topic "backport-connectivityresources" am: 744e27a39e am: b8acfc2327 am: cec8be5ba4 -s ours 
am skip reason: skip tag Change-Id Ic0d24d36af0b87153d527083f8964ddc6cd78482 with SHA-1 a405de0796 is already in history

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

Change-Id: Ie24e96154851ddeac6971e4bfa49a0eb43e5915c
 2021-03-22 12:27:31 +00:00
Lorenzo Colitti
a6809963a3 [automerger skipped] Cherry-pick some test changes from ag/13210542. am: 250710c687 am: 127c8b8336 am: b8a344c44c -s ours 
am skip reason: skip tag Change-Id I35d28c8df341dbbac2774026c6ca749e296c0482 with SHA-1 21147c02f8 is already in history

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

Change-Id: I886ca8978862d2dacc11d2bd5d4977698e953935
 2021-03-22 12:27:21 +00:00