Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
682,072 Commits 3 Branches 0 Tags
495a05886fe3a2da83092a214d44dbf0fbc61d12
Commit Graph

682072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
495a05886f Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 am: 56cc4a092d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: Ib461951bdb6f41b85b1ae5387b4b3b51cee613a8
 2022-01-07 16:16:29 +00:00
Treehugger Robot
3fe0c62490 Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb am: cb6617a563 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I24ef55a8dc58e5917109c3993b02ddfe147e1064
 2022-01-07 16:15:23 +00:00
TreeHugger Robot
23e9f0b15a Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master am: 105f98c38c am: d31bba2d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16582694

Change-Id: Iad60f80daa4503b149c18584c8a6fba2ca554526
 2022-01-07 16:14:56 +00:00
Treehugger Robot
56cc4a092d Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: I7e4c2d105ca8876e47162f1d1629c0b16937621b
 2022-01-07 15:55:01 +00:00
TreeHugger Robot
9e08f02dbb Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev am: 3ba0620ec6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576585

Change-Id: I0918991d3982b919209b7cb70a3d8183960b5203
 2022-01-07 15:54:03 +00:00
Treehugger Robot
cb6617a563 Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I561e94026c5ab362638a1e1e387ca9e02afdeb13
 2022-01-07 15:53:51 +00:00
TreeHugger Robot
3ba0620ec6 Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev 2022-01-07 15:28:38 +00:00
TreeHugger Robot
cfa5c420e3 Merge "Fix flaky test WindowInputTestsi#testTrustedOverlapWindow" into sc-v2-dev am: 651343388f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16544958

Change-Id: I4001fabda75da2bfc2da66eb7692cc021078e549
 2022-01-07 15:02:02 +00:00
TreeHugger Robot
651343388f Merge "Fix flaky test WindowInputTestsi#testTrustedOverlapWindow" into sc-v2-dev 2022-01-07 14:48:17 +00:00
TreeHugger Robot
d31bba2d5c Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master am: 105f98c38c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576463

Change-Id: I2539ffd6d175a1cda9100055f37a4b92184c6a83
 2022-01-07 14:05:53 +00:00
Treehugger Robot
5c6ca53a00 Merge "Add necessary parcelables of metadata" am: 8ed7defe20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936186

Change-Id: I145c9b1dcf79b88f8e6508ef52830f22c919d4bf
 2022-01-07 13:26:34 +00:00
Treehugger Robot
8ed7defe20 Merge "Add necessary parcelables of metadata" 2022-01-07 13:07:11 +00:00
Selim Cinek
c3125d64d4 Fixed an issue where the user could be stuck with pulse expanding 
Added a lot more logging and dumping to the LS shade controller
and the pulse expansion handler.
Also added a safeguard and fixed a bug where the pulse expansion
wasn't reset in lockedDown mode.
Fixed an issue where aborting the unlock in docked down shade wouldn't
reset the dragdown amount.
Always allowing the set the dragdown amount if it's a reset.

Fixes: 209839390
Fixes: 198098523
Test: see repo steps in bug, avoid it manually, run regular tests
Merged-In: I3398763141e8f828c00fb5d5184d64ffc66d3237
Change-Id: I3398763141e8f828c00fb5d5184d64ffc66d3237
 2022-01-07 13:40:14 +01:00
Treehugger Robot
bc8cdbeecb Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: Ie15d4d9d2e8239f89d0561dd22863726d732ab3c
 2022-01-07 12:30:46 +00:00
Treehugger Robot
81589202e5 Merge "[MS22] Move NetworkManagementSocketTagger into the module" 2022-01-07 12:07:53 +00:00
TreeHugger Robot
105f98c38c Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master 2022-01-07 12:00:48 +00:00
TreeHugger Robot
750a48e1fe Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into sc-v2-dev-plus-aosp 2022-01-07 11:31:53 +00:00
Mariia Sandrikova
0cb2c45802 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev am: b6c52ec273 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527687

Change-Id: Ib282c2fc1fd01d26841ee2003cd604d4150e569f
 2022-01-07 11:02:56 +00:00
Mariia Sandrikova
b6c52ec273 Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev 2022-01-07 10:49:20 +00:00
Junyu Lai
b7d0199763 [MS22] Move NetworkManagementSocketTagger into the module 
This is heavily used by TrafficStats, and no other modules
are using it. Hence it should be moved to the module as well.

Test: TH
Bug: 204830222

Change-Id: I7ea1ccb916e796c786c29d53e4ecf3970a8af6dd
 2022-01-07 09:57:15 +00:00
Weng Su
d983980b59 Merge "Add new class for WiFi restractions caching" into sc-v2-dev am: 0a86f0c00e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16545011

Change-Id: Ie5ee91a5598e64531ab82b973ef4a06d7f3e6e5a
 2022-01-07 07:47:20 +00:00
Weng Su
0a86f0c00e Merge "Add new class for WiFi restractions caching" into sc-v2-dev 2022-01-07 07:30:13 +00:00
Bill Yi
bd2f25e561 [automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 99d8d1fd2b -s ours am: 4dd84bbe11 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a651572d752ef102d40ca730644f9dcbf1ddbe9
 2022-01-07 02:22:57 +00:00
Arthur Hung
7ed2d03fdb Fix flaky test WindowInputTestsi#testTrustedOverlapWindow 
When disabling batching input, we should post the action to consume
batched events to prevent it would be handled before current event.

Bug: 189241600
Test: atest WindowInputTests --rerun-until-failure
Change-Id: I87aaa2574a27368f88df1aba3f2eb769a8e8f36b
(cherry picked from commit a0ef47223c)
 2022-01-07 02:22:28 +00:00
Bill Yi
4dd84bbe11 [automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 99d8d1fd2b -s ours 
am skip reason: Merged-In I4c199ec81b3f30a3a12ae40af29185549387d34d with SHA-1 9be07bf54c is already in history

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

Change-Id: I128f5ed6c1bad350ea449bba5da21123de3ea31b
 2022-01-07 02:01:46 +00:00
Bill Yi
99d8d1fd2b Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2022-01-07 01:41:28 +00:00
TreeHugger Robot
e00b6c3a90 Merge "Fixes DPMS.getEnforcingAdminAndUserDetailsInternal()" into sc-v2-dev am: ce918f5f74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16511704

Change-Id: Ib004fe722b515d4efd25da35918510e206c19519
 2022-01-07 01:36:05 +00:00
Meng Wang
d21df6ed29 Merge changes from topic "phonenumber" am: 886bf03a2d am: e88de1e6df am: e32ed4893f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921061

Change-Id: I70e56342d9e519b04e178f009278f49e7816cc27
 2022-01-07 01:28:34 +00:00
Meng Wang
fd1302b4ef Deprecate get/setLine1Number in favor of get/setPhoneNumber am: 3e436616c6 am: 9fb15e5b46 am: 9c95c6e001 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920743

Change-Id: I78b077c4d8c27b8ce1077bf152721cce4e362980
 2022-01-07 01:28:30 +00:00
TreeHugger Robot
ce918f5f74 Merge "Fixes DPMS.getEnforcingAdminAndUserDetailsInternal()" into sc-v2-dev 2022-01-07 01:20:18 +00:00
Meng Wang
e32ed4893f Merge changes from topic "phonenumber" am: 886bf03a2d am: e88de1e6df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921061

Change-Id: I8c487d6e8ee925672c422162b402c0f3343bf360
 2022-01-07 01:06:59 +00:00
Meng Wang
9c95c6e001 Deprecate get/setLine1Number in favor of get/setPhoneNumber am: 3e436616c6 am: 9fb15e5b46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920743

Change-Id: I79d6208a93a9449a60d0149e5488dcb1633afb0d
 2022-01-07 01:06:58 +00:00
Meng Wang
e88de1e6df Merge changes from topic "phonenumber" am: 886bf03a2d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921061

Change-Id: I90ca5ccbf686a975f479c2488ff34f82af12946a
 2022-01-07 00:46:54 +00:00
Meng Wang
9fb15e5b46 Deprecate get/setLine1Number in favor of get/setPhoneNumber am: 3e436616c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920743

Change-Id: Id7ad3d155ef1164c0b86e3ebf579e2faf512b1af
 2022-01-07 00:46:51 +00:00
Treehugger Robot
a2abf5025b Merge "Bluetooth: add LE Audio COD constant definition" am: d35cd459d6 am: c252a62ded am: 94a531c7fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1937497

Change-Id: I4d4060067286d9e2c5c422c7bbe12cfabd5f720c
 2022-01-07 00:35:31 +00:00
Meng Wang
886bf03a2d Merge changes from topic "phonenumber" 
* changes:
  Update javadocs based on API council feedback.
  Deprecate get/setLine1Number in favor of get/setPhoneNumber
 2022-01-07 00:31:23 +00:00
Treehugger Robot
94a531c7fa Merge "Bluetooth: add LE Audio COD constant definition" am: d35cd459d6 am: c252a62ded 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1937497

Change-Id: I77cf59044f24b81c950e3884549dad17ef522361
 2022-01-07 00:24:01 +00:00
Li Li
e3680890a0 Merge "Reset app freezer timeout for broadcast messages" into sc-v2-dev am: 64bab6b20b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16577086

Change-Id: Ic5dfd663af1b0bc55bd49e06fe07f84bb6652a27
 2022-01-07 00:23:54 +00:00
Li Li
64bab6b20b Merge "Reset app freezer timeout for broadcast messages" into sc-v2-dev 2022-01-07 00:07:35 +00:00
Treehugger Robot
c252a62ded Merge "Bluetooth: add LE Audio COD constant definition" am: d35cd459d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1937497

Change-Id: Ie934eb7ea8e83e7ecaf99f6cc496a455fd1fcd46
 2022-01-07 00:03:00 +00:00
Qasim Javed
c93e7bf82a Merge "Add BluetoothLeBroadcastAssistantCallback." am: bfad455280 am: d89e584952 am: 6b795762eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921059

Change-Id: I44ec395413eeb865a9a5a12a7574fdcff56653ed
 2022-01-06 23:53:36 +00:00
Treehugger Robot
d35cd459d6 Merge "Bluetooth: add LE Audio COD constant definition" 2022-01-06 23:47:54 +00:00
Qasim Javed
6b795762eb Merge "Add BluetoothLeBroadcastAssistantCallback." am: bfad455280 am: d89e584952 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921059

Change-Id: Icf97f379b9d6540f3ff6c68e7a0ccb4f4dcace66
 2022-01-06 23:38:22 +00:00
Qasim Javed
d89e584952 Merge "Add BluetoothLeBroadcastAssistantCallback." am: bfad455280 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921059

Change-Id: Id59f4ca8952ad7a9376117762397ec395c3178e3
 2022-01-06 23:23:11 +00:00
Qasim Javed
bfad455280 Merge "Add BluetoothLeBroadcastAssistantCallback." 2022-01-06 23:00:35 +00:00
TreeHugger Robot
210765e885 Merge "Fix LaunchAnyWheere via an Evil Card in QuickAccessWallet." into sc-v2-dev am: 34d9f068d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16564840

Change-Id: Id4c5d58f668b814b0d22c491ec3289e1c49e627d
 2022-01-06 21:42:41 +00:00
TreeHugger Robot
34d9f068d1 Merge "Fix LaunchAnyWheere via an Evil Card in QuickAccessWallet." into sc-v2-dev 2022-01-06 21:22:48 +00:00
TreeHugger Robot
be0e60173a Merge "Notify display brightness changed due to brightness transforms" into sc-v2-dev am: 272775d306 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16391518

Change-Id: Ifeb42e98c5f4de2b5e13697dd2f2a75653a974c4
 2022-01-06 20:55:46 +00:00
Winson Chiu
59b5a55a09 Merge "Verify querent for printing app links state" into sc-v2-dev am: 8e86f85849 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16549703

Change-Id: Ia5c19d9e0f71f6eb157e30a038f2c6e222dd24de
 2022-01-06 20:54:48 +00:00
TreeHugger Robot
272775d306 Merge "Notify display brightness changed due to brightness transforms" into sc-v2-dev 2022-01-06 20:21:51 +00:00