Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
738,684 Commits 3 Branches 0 Tags
e4cd792babd5043cd2a1d5591bf41f664ec6cb72
Commit Graph

738684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chapin
e4cd792bab Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 am: 84913280a8 am: 35117a7596 am: 815d4cedea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: I49a731122e7bdf8498ed00a30568a71cf66cad47
 2022-01-07 16:31:49 +00:00
Treehugger Robot
2def76d43e [automerger skipped] Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 am: 56cc4a092d am: 495a05886f -s ours 
am skip reason: Merged-In I3331d7e3d76db50f5b3c4db57891a20e4f935ad8 with SHA-1 67c75e4640 is already in history

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

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

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

Change-Id: I5a7782f0c6f4ffccbb5a07af376e4694b1cbc457
 2022-01-07 16:29:30 +00:00
Caitlin Cassidy
07ecbc6ee6 Merge "[Disable Flags] Update logging to make it clear when there's been no change." 2022-01-07 16:28:12 +00:00
Fedor Kudasov
01c0d6b983 Merge "Annotate com.android.systemui.qs with @Nullable" 2022-01-07 16:19:38 +00:00
chapin
815d4cedea Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 am: 84913280a8 am: 35117a7596 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: I16e62355558973caf77b9a0ab7c00a273af756b2
 2022-01-07 16:17:00 +00:00
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
63fd265a8a [automerger skipped] Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev am: 3ba0620ec6 am: 9e08f02dbb -s ours 
am skip reason: Merged-In I3398763141e8f828c00fb5d5184d64ffc66d3237 with SHA-1 a7617fc89d is already in history

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

Change-Id: I1774f0a743e07d98ebc240115dbd41cec71df8cd
 2022-01-07 16:08:19 +00:00
chapin
35117a7596 Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 am: 84913280a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: Ic2e007688e9d6c85729d4e159d53dcd1eb2f3f03
 2022-01-07 15:55:38 +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
Daniel Hsieh
bc079ff05f Merge "Support following typing focus in window mode [3/n]." 2022-01-07 15:44:21 +00:00
TreeHugger Robot
edd5a0747a Merge "Create FoldStateLoggingProvider" 2022-01-07 15:43:00 +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
Selim Cinek
d65d1745d2 Merge "Fixed an issue where the user could be stuck with pulse expanding" 2022-01-07 15:24:53 +00:00
Nicolò Mazzucato
3f1705f002 Merge changes from topic "revert-16320675-aosp_ims_config-DFMXSETNRH" 
* changes:
  Revert "Add IMS configs to CarrierConfigManager"
  Revert "Add IMS Voice, Video, Supplementary services, emergency ..."
 2022-01-07 15:21:22 +00:00
Miranda Kephart
ed5207f4b5 Merge "Add RECEIVER_EXPORTED flags to screenshots" 2022-01-07 15:17:17 +00:00
TreeHugger Robot
413e92ac19 Merge "Fix flaky test WindowInputTestsi#testTrustedOverlapWindow" into sc-v2-dev am: 651343388f am: cfa5c420e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16544958

Change-Id: I59a4af69db4c0b9bf0e906cb56f5304dc2af37ea
 2022-01-07 15:15:13 +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
0f341380a4 Merge "Treat mock locations the same for wakelocks" 2022-01-07 14:54:55 +00:00
Nicolò Mazzucato
239b68461f Revert "Add IMS configs to CarrierConfigManager" 
Revert submission 16320675-aosp_ims_config

Reason for revert: Breaks build
Bug: 213576201
Reverted Changes:
I853fe100e:Add IMS Voice, Video, Supplementary services, emer...
I9b4e429af:Add IMS configs to CarrierConfigManager

Change-Id: I1d45b6c09524c8db96a1e708ced5426b0aefa5f4
 2022-01-07 14:51:01 +00:00
Nicolò Mazzucato
1994bbcdae Revert "Add IMS Voice, Video, Supplementary services, emergency ..." 
Revert submission 16320675-aosp_ims_config

Reason for revert: Breaks build
Bug: 213576201
Reverted Changes:
I853fe100e:Add IMS Voice, Video, Supplementary services, emer...
I9b4e429af:Add IMS configs to CarrierConfigManager

Change-Id: Iff64c697ab9e4e64acbfefbe24d23ac067152aec
 2022-01-07 14:51:01 +00:00
TreeHugger Robot
651343388f Merge "Fix flaky test WindowInputTestsi#testTrustedOverlapWindow" into sc-v2-dev 2022-01-07 14:48:17 +00:00
Ronish Kalia
dfb0d60d3b Merge "Change QR code tile details" 2022-01-07 14:39:25 +00:00
chapin
84913280a8 Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: Ia421bad5eb2b72abb737a39e76ab81013e3f0a1a
 2022-01-07 14:31:24 +00:00
chapin
279b828fd8 Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" 2022-01-07 14:08:23 +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
Sateshk Kumar Chinnappan
fd9ab05296 Merge "Add IMS Voice, Video, Supplementary services, emergency call, WFC call, RTT call related configs to CarrierConfigManager." 2022-01-07 13:55:07 +00:00
Sateshk Kumar Chinnappan
8874566762 Merge "Add IMS configs to CarrierConfigManager" 2022-01-07 13:55:07 +00:00
Fedor Kudasov
0a7934c3f9 Annotate com.android.systemui.qs with @Nullable 
Bug: 209459024
Test: m SystemUI-core
Change-Id: I48ba7039ca826c8304f425f34a8c84981710dc77
 2022-01-07 13:51:16 +00:00
Nicolo' Mazzucato
2e4d663ee0 Create FoldStateLoggingProvider 
The aim of this class it to output fold state changes with the time between them.
Those will be logged in a follow up change to uptimize fold/unfold experience.

+ Changed files have been reformatted according to ktfmt. Those are minimal changes.
+ Making some return type explicit in dagger modules

Bug: 198305865
Test: atest FoldStateLoggingProviderTest
Change-Id: I3dcfa742f2cf3c712796b5c6f5481f319b680a12
 2022-01-07 14:47:37 +01:00
Chris Li
ceabc8c201 Merge "Enter PIP when exiting prev PIP with Shell transition" 2022-01-07 13:46:22 +00:00
Aaron Huang
3274151bbb Merge "Use public resouce in android.R package" 2022-01-07 13:44:02 +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
Selim Cinek
a7617fc89d 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
Change-Id: I3398763141e8f828c00fb5d5184d64ffc66d3237
 2022-01-07 13:40:02 +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
Eden Su
5279dc3512 Merge "Add carrier config for EAP-AKA fast reauth feature" 2022-01-07 11:51:11 +00:00
TreeHugger Robot
ccfb317a2f [automerger skipped] Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into sc-v2-dev-plus-aosp am: 750a48e1fe -s ours 
am skip reason: Merged-In Iabd1ee367d8234425c5770455a20a413cc37c6a7 with SHA-1 86dcd1fdf7 is already in history

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

Change-Id: Iacc00fadc219e886712dbf2cab5cab986de985f7
 2022-01-07 11:47:28 +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
TreeHugger Robot
74b8b789e8 Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" 2022-01-07 11:31:37 +00:00
Mariia Sandrikova
d2ccf6edac Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev am: b6c52ec273 am: 0cb2c45802 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527687

Change-Id: I0cf5f6fa171d2cd9f402cd1439c3418631718cc9
 2022-01-07 11:23:05 +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