Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
734,282 Commits 3 Branches 0 Tags
59fb57da378b595010f2cc0cee75007b94a01bcd
Commit Graph

734282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
59fb57da37 Merge "Fix updating max circulation value." 2021-12-02 22:04:09 +00:00
TreeHugger Robot
904427d6b5 Merge "Add public getters to AssociationRequest" 2021-12-02 21:52:24 +00:00
Dmitri Plotnikov
690f06ab1e Merge "Fix IndexOutOfBounds exception in dumpsys batterystats" 2021-12-02 21:48:14 +00:00
Pavel Grafov
5527086861 Merge "Move policy upgrade to DPMS ctor" 2021-12-02 21:32:10 +00:00
Yuri Lin
665ce344ce Merge "Add user-set boolean to notification permission values." 2021-12-02 21:18:12 +00:00
TreeHugger Robot
e55fb53ede [automerger skipped] Merge "Allow split position constants to be used in launcher." into sc-v2-dev am: 99461804ca am: 68ab1bd457 -s ours 
am skip reason: Merged-In I7c5649449389413d1435798c3e757103c4ced038 with SHA-1 a191eb7e3c is already in history

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

Change-Id: I50bc6f7d3a51e33d82e495643ff1c7c97d10bb2c
 2021-12-02 21:01:10 +00:00
Yan Yan
a2997303dd Merge changes I5cd2982f,Ia7f44c5f am: 8d6d8dcc4f am: 0ec026914a am: 88d3ad7f03 am: 919a6ef2bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902413

Change-Id: Icb691f8a500a6599518036ac77e5343205cc0079
 2021-12-02 21:00:26 +00:00
Treehugger Robot
68d294d8b5 [automerger skipped] Merge "Create a new key to backup Sim-specific data." am: 51fae20957 am: cc8ff98d9d am: e28d4fcc5e -s ours am: 4988aaf257 -s ours 
am skip reason: Merged-In I84b42690f8dd3de0cbd795cc13dd5f9ab5a7a725 with SHA-1 1b8956bb03 is already in history

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

Change-Id: Ie5dd684bf1050651f07a7a9c636347e423be700a
 2021-12-02 20:59:44 +00:00
Treehugger Robot
8ebcb93114 Merge "Check for initialization of mUpdateEngine" am: e3a84af1a7 am: 0d39f92360 am: a545285129 am: 53f0434a3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1907970

Change-Id: I6495a2790f9ebc5f1b0b64a5a061d03f49816111
 2021-12-02 20:58:59 +00:00
TreeHugger Robot
68ab1bd457 Merge "Allow split position constants to be used in launcher." into sc-v2-dev am: 99461804ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16373281

Change-Id: I9e68c75cf661851de7d84955668f469b70a933f9
 2021-12-02 20:50:25 +00:00
TreeHugger Robot
e58f91a3ef Merge "Allow modify phone state permission" 2021-12-02 20:40:40 +00:00
Yan Yan
919a6ef2bf Merge changes I5cd2982f,Ia7f44c5f am: 8d6d8dcc4f am: 0ec026914a am: 88d3ad7f03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902413

Change-Id: I51d85e1f2641405ac22f47e06c15d0df42ddc835
 2021-12-02 20:38:24 +00:00
Treehugger Robot
4988aaf257 [automerger skipped] Merge "Create a new key to backup Sim-specific data." am: 51fae20957 am: cc8ff98d9d am: e28d4fcc5e -s ours 
am skip reason: Merged-In I84b42690f8dd3de0cbd795cc13dd5f9ab5a7a725 with SHA-1 1b8956bb03 is already in history

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

Change-Id: If5742c38829ea515449ee1bc07e9e7f9ad26ce16
 2021-12-02 20:38:10 +00:00
Treehugger Robot
53f0434a3f Merge "Check for initialization of mUpdateEngine" am: e3a84af1a7 am: 0d39f92360 am: a545285129 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1907970

Change-Id: Ia4be80b9da8060e9bc24dbdce7d956e21bbba1e6
 2021-12-02 20:37:45 +00:00
Yan Yan
88d3ad7f03 Merge changes I5cd2982f,Ia7f44c5f am: 8d6d8dcc4f am: 0ec026914a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902413

Change-Id: Iecc6f5557814fd635416a74e716e26571237e2f9
 2021-12-02 20:35:14 +00:00
Treehugger Robot
e28d4fcc5e Merge "Create a new key to backup Sim-specific data." am: 51fae20957 am: cc8ff98d9d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909371

Change-Id: Id42dd0e5ce333fa313cf73c300d1dcfbc308d4fe
 2021-12-02 20:34:56 +00:00
TreeHugger Robot
99461804ca Merge "Allow split position constants to be used in launcher." into sc-v2-dev 2021-12-02 20:32:08 +00:00
Yan Yan
0ec026914a Merge changes I5cd2982f,Ia7f44c5f am: 8d6d8dcc4f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902413

Change-Id: I3875c5edeeea2c996d643e9b4f0b027baa718c94
 2021-12-02 20:20:19 +00:00
Treehugger Robot
cc8ff98d9d Merge "Create a new key to backup Sim-specific data." am: 51fae20957 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909371

Change-Id: Ibdfce8ca19f3c1946f422852d017fbb5010ddd57
 2021-12-02 20:19:47 +00:00
Treehugger Robot
a545285129 Merge "Check for initialization of mUpdateEngine" am: e3a84af1a7 am: 0d39f92360 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1907970

Change-Id: I10d42d3c1a27430b377c0363e91a7e37b246ef07
 2021-12-02 20:19:12 +00:00
Nicolò Mazzucato
7d148d1b40 Merge "Convert ScopedUnfoldTransitionProgressProvider.java to kotlin" 2021-12-02 19:31:48 +00:00
Kweku Adams
dca9cf22a6 Fix updating max circulation value. 
The individual EconomicPolicies were correctly reading the Settings
constants for the max circulation in setup(), but
CompleteEconomicPolicy treated those values as final upon
initialization, so it wasn't updating the max circulation.

Bug: 158300259
Test: set value via adb and confirm limit increased in dumpsys
Change-Id: Ic9769a4173d652d8dc2ca43677e4618c57869613
 2021-12-02 11:28:29 -08:00
Nate Myren
bd203d055e Merge "Create a API #onActivityLaunched in ActivityInterceptorCallback" 2021-12-02 19:26:12 +00:00
Kweku Adams
50a7bb0f6b Merge "Allow dumping all transactions." 2021-12-02 19:21:08 +00:00
Kweku Adams
bd897fdd32 Merge "Add SystemApi to change app launch time estimates." 2021-12-02 19:20:43 +00:00
Yan Yan
8d6d8dcc4f Merge changes I5cd2982f,Ia7f44c5f 
* changes:
  Support configuring VcnUnderlyingNetworkPriority in VcnGatwayConnectionConfig
  Create VcnCellUnderlyingNetworkPriority
 2021-12-02 19:17:33 +00:00
Treehugger Robot
51fae20957 Merge "Create a new key to backup Sim-specific data." 2021-12-02 19:16:07 +00:00
Treehugger Robot
0d39f92360 Merge "Check for initialization of mUpdateEngine" am: e3a84af1a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1907970

Change-Id: Ic6dd9dcbc427d9c867f2b1ccb447a591deb05c96
 2021-12-02 19:11:39 +00:00
Joshua Trask
943415466f Merge "Un-@Ignore 7 passing ChooserActivity tests." 2021-12-02 19:05:37 +00:00
Sally Qi
a54976ec22 Merge "Add DataSpace API to convert between ADataSpace and ColorSpace" 2021-12-02 19:02:12 +00:00
TreeHugger Robot
c0eb03c75e [automerger skipped] Merge "Fix incorrect SID matching for bio prompts" into sc-v2-dev am: 98ec23dc04 -s ours am: 726cea787c -s ours 
am skip reason: Merged-In Ib95b0564aa098157718b8d4a45b11baa69dad71b with SHA-1 c78e369c4c is already in history

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

Change-Id: I279107d2dfdfb22972219c03ba0db3f48e156975
 2021-12-02 18:57:49 +00:00
TreeHugger Robot
b3a9d985b5 Merge "Fix CTS failure for waterfall device" into sc-v2-dev am: 990528e9be am: 712b93d725 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16346906

Change-Id: I22bccf99c4b6e43823040cb8683a5626cde0f525
 2021-12-02 18:57:27 +00:00
TreeHugger Robot
fceb85da94 Merge "Consolidate clearing mImeInsetsFrozenUntilStartInput" into sc-v2-dev am: 42a9a04b9d am: 540ad63eca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375744

Change-Id: Ib506855eb2f5b20d1357661b871ebcfcb902cfd0
 2021-12-02 18:56:55 +00:00
Charles Chen
6af506dff2 Merge "Verify WindowContext gets custom Drawable" into sc-v2-dev am: 0ef22432a8 am: ef0bbb8f6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16346904

Change-Id: Ib957e1d833f92abcbf98a1f6dacd8fa627f0222c
 2021-12-02 18:56:20 +00:00
Nick Chameyev
522207a48d Merge "Fix narrow statusbar when folding" into sc-v2-dev am: 4003a0d744 am: 2367ce39e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16330812

Change-Id: Ic53908a4725c37d79576c10321a1ee21f23403f7
 2021-12-02 18:55:35 +00:00
Zoey Chen
6197b8abf8 Merge "[Provider Model] Show airplane off button and carrier network if airplane mode is on" into sc-v2-dev am: e2536dfa19 am: 339e7e5027 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16331062

Change-Id: I74a6af936e17493fc7938a55b182879212b3685a
 2021-12-02 18:54:47 +00:00
TreeHugger Robot
6e745fb1a4 Merge "Adjust size of badge on managed user." into sc-v2-dev am: 7503c5a6d8 am: 8edf7fe2fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371824

Change-Id: Ia71318ed005a16dca76bc45fd33a612cf779fe74
 2021-12-02 18:53:21 +00:00
Treehugger Robot
bf742a6791 Merge "Fix incorrect SID matching for bio prompts" am: 8d221843b7 am: 63a204f231 am: 22a5b5a0dd am: ec080ef112 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1908470

Change-Id: Ic762c34f51955f73b83002cb6a2dee74caa481fe
 2021-12-02 18:50:39 +00:00
Paul Hu
0ebac1f535 Merge "Centralize nsd associated files" am: 32942299d3 am: 9238a7c49e am: 80425b7eeb am: 29bccff63b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895244

Change-Id: Ic43cd5dc4ab9f0b98af3750d610cc48dd8860423
 2021-12-02 18:48:56 +00:00
Yan Yan
7b7245a6ca Merge "Create VcnUnderlyingNetworkPriority and the subclass for Wifi" am: cc09b29e59 am: 5d69a99ee6 am: a3c6f3bb50 am: 205b8fca07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1901036

Change-Id: I57e218e05f26f5d4a31e63e30ca3d5e242333fd1
 2021-12-02 18:47:35 +00:00
Treehugger Robot
fa2f5ac2b8 Merge "Make StubVolumes visible for read" am: 6a20288d86 am: 3274e47ac9 am: 91b2f9a08a am: 136bded3f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889176

Change-Id: I38263733d5e426dcb24d224fd59e84d5a35f458e
 2021-12-02 18:45:32 +00:00
Treehugger Robot
e3a84af1a7 Merge "Check for initialization of mUpdateEngine" 2021-12-02 18:44:59 +00:00
TreeHugger Robot
06ecf15462 Merge "Merge "Merge "audio: Update TEST_MAPPING to include CtsMediaAudioTestCases" am: 679da0392d am: 7fcb1985de am: 5fe48f65d9" into sc-v2-dev-plus-aosp am: 35ef63cc17" 2021-12-02 18:40:39 +00:00
Sooraj Sasindran
09869621d5 Allow modify phone state permission 
Allow modify phone state permission to access
isDataEnabled

Bug: 205599503
Test: build.
Change-Id: Iee0d3af863b9d0d24cafd55df2b645f216c7237a
 2021-12-02 18:23:32 +00:00
Joe Bolinger
beedf62ae3 Merge "Prompt for confirmation when sfps is active and the power button is pressed." 2021-12-02 18:16:52 +00:00
Jack Nudelman
5dff75b3d6 Create a new key to backup Sim-specific data. 
Bug: b/206309441
Test: b/206986278
Change-Id: I84b42690f8dd3de0cbd795cc13dd5f9ab5a7a725
Merged-In: I84b42690f8dd3de0cbd795cc13dd5f9ab5a7a725
 2021-12-02 18:05:33 +00:00
TreeHugger Robot
726cea787c [automerger skipped] Merge "Fix incorrect SID matching for bio prompts" into sc-v2-dev am: 98ec23dc04 -s ours 
am skip reason: Merged-In Ib95b0564aa098157718b8d4a45b11baa69dad71b with SHA-1 c78e369c4c is already in history

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

Change-Id: I45a19e7daaaed42c0b3bb3f9db0fb1dd38b7522e
 2021-12-02 17:27:40 +00:00
TreeHugger Robot
efdc32ca04 Merge "Don't restart processes that host visible activities" 2021-12-02 17:17:11 +00:00
Yuri Lin
d6e679f471 Add user-set boolean to notification permission values. 
This change allows for logs and dumps to collect whether any package bans were set by the user or not, and adds that info to the string (logcat) dump. This is also in preparation for adding this field to the PackageNotificationPreferences pulled atom (will be in a future CL).

Bug: 194833441
Test: NotificationmanagerServiceTest, NotificationPermissionMigrationTest, PermissionHelperTest, PreferencesHelperTest
Change-Id: Ic119522a7fedd1869697f320e57813292f4115ce
 2021-12-02 12:16:07 -05:00
TreeHugger Robot
98ec23dc04 Merge "Fix incorrect SID matching for bio prompts" into sc-v2-dev 2021-12-02 17:03:45 +00:00