Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
624,756 Commits 3 Branches 0 Tags
7efc57797cd1d89420e22bb1e41172f0d04bc4cb
Commit Graph

624756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Chang
7efc57797c Rename Stack to Task related terms (7/n) 
- Renaming PinnedStack to PinnedTask
- Renaming DockedStack to DockedTask

Bug: 157876447
Test: presubmit
Change-Id: I51c10564647ed0d46eddc0c51a1ee06eef897e43
 2021-02-25 04:57:26 +00:00
Remi NGUYEN VAN
c048b1c769 Merge "Split parcelable .aidl files to aidl-export" into sc-dev 2021-02-18 01:16:10 +00:00
Rubin Xu
a06569676e [automerger skipped] Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716 am: 5bddee5dda am: 7e3ab7815a -s ours 
am skip reason: Change-Id I8487ebc13758a31639d55c8e380faa51d1cfd843 with SHA-1 ad53ef61e7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4296856168c4a7261fd12a172e0336010688499e
 2021-02-18 00:30:09 +00:00
TreeHugger Robot
2cc5ce22b5 Merge changes I474cd019,I8d87c1da,I90ebad48 into sc-dev 
* changes:
  Make CpuPowerCalculator's Estimators available to com.android.internal
  Implement EnergyConsumer type to ids map for targeted querying
  Add cpu proc file read throttling enabling/disabling
 2021-02-18 00:24:48 +00:00
Eugene Susla
e982bd2520 Merge "More CDM logging" into sc-dev 2021-02-18 00:22:17 +00:00
Yin-Chia Yeh
73ef4bcca6 Merge "Camera: add default secure image size key" into sc-dev 2021-02-18 00:15:09 +00:00
Garfield Tan
2faabc9b7a Merge "Stop dispatching TaskInfo change when focus changes" into sc-dev 2021-02-18 00:15:00 +00:00
TreeHugger Robot
bf07abc3aa Merge "Add listener for conversation changes" into sc-dev 2021-02-17 23:53:55 +00:00
Rubin Xu
7e3ab7815a Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716 am: 5bddee5dda 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7967cc8c972f5d141ba83a7e2cb882ddb529c663
 2021-02-17 23:51:12 +00:00
Yomna Nasser
a20761e23f Merge "Implementation of "Enable 2G" for Settings." into sc-dev 2021-02-17 23:45:17 +00:00
Hall Liu
f4f96c166b Merge "Improve docs for uploadCallComposerPicture" into sc-dev 2021-02-17 23:44:26 +00:00
Shuo Qian
db9ef8e719 Merge "Add APIs for updating, query 5G slicing status" into sc-dev 2021-02-17 23:39:17 +00:00
Kevin Chyn
fe62a99c63 Merge changes I3fdb3fe0,I59f6e607 into sc-dev 
* changes:
  Try to ensure tests run sequentially
  Update RemovalClient to support new biometric AIDL
 2021-02-17 23:36:03 +00:00
Lucas Dupin
01e303fbb5 Merge "Add neutral palette, rename main and accent" into sc-dev 2021-02-17 23:25:03 +00:00
Winson Chiu
61bd11c543 Merge "Fix SettingsXml start tag logic" into sc-dev 2021-02-17 23:23:05 +00:00
Winson Chiu
cfbcacab0f Merge "Fix invalid size in intent resolution filterApprovedApp" into sc-dev 2021-02-17 23:22:02 +00:00
Rubin Xu
5bddee5dda Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e32e5e7fdc894bf2ce92fe955c92207e4d0fb4
 2021-02-17 23:17:40 +00:00
Alexandre Elias
4d9a095264 Merge "Fix transition animation when going back twice" into sc-dev 2021-02-17 23:12:59 +00:00
Alexandre Elias
ae5517e9a4 Fix transition animation when going back twice 
The logic in ag/5108931 was intended to suppress the next return
animation if it would cross a task boundary, while preserving return
animations in all other cases.  However, it accidentally caused
excessive suppressions in the case of repeated back button presses.  The
reason is that although the sending activity is indeed only topOfTask
when moving forward cross-task, it's *always* topOfTask when pressing
back, so the state of the sending activity doesn't contain sufficient
information to feed this logic.

This patch changes to suppress when the receiving activity is task root,
which is a more direct and reliable signal.  (By definition, the return
transition from an activity will cross a task boundary if and only if
it's the task root.)

Fixes: 177780499
Test: New test in ag/13593522

Change-Id: Ia5751da6122dc1ddb557f45318712185fa0b3df9
 2021-02-17 23:12:19 +00:00
Rubin Xu
5eeae4c716 Merge "Add KeyChain Test API for the credential manager" 2021-02-17 22:47:20 +00:00
TreeHugger Robot
f3efab1326 Merge "Clean up some dump code." into sc-dev 2021-02-17 22:43:07 +00:00
Jorge Gil
6723b90ef8 Merge "Align PIP menu after rotation" into sc-dev 2021-02-17 22:41:00 +00:00
Yan Yan
add92198a5 Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d am: 8f2b5071b3 am: 559fd17ee9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I349d2f7e4c6bbeb28e0cd79be1ed5b6480558144
 2021-02-17 22:30:26 +00:00
Hunter Knepshield
2b2c3e6724 Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9 am: 7c7bb0cb69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65c281e0e6064b7335b9ca7942de1480d0e998c5
 2021-02-17 22:29:55 +00:00
Yan Yan
9fb7d8f7a2 Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d am: 14e64c42ad am: e0610fe112 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f0336b434f42cba3bce793d8ec8d16a401bf117
 2021-02-17 22:29:33 +00:00
Treehugger Robot
efa809eea0 [automerger skipped] Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b am: 94e09fbe6a -s ours 
am skip reason: Change-Id I7a3c442bb27da5948bc9ead146c77213de6b56cc with SHA-1 12af11d6f5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I974e14f94aa3d3ffd07aff058d5777894cc71ad5
 2021-02-17 22:28:34 +00:00
Brad Ebinger
d9e4faebe8 Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 am: abfa62f80b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6780e5f6a10924f4b445fb100535961b3272166f
 2021-02-17 22:28:02 +00:00
Kevin Chyn
e5ffb5805e Merge "Retrieve authenticatorId when already targetUserId" into sc-dev 2021-02-17 22:17:07 +00:00
Shubang Lu
0fc89d9664 Merge changes from topics "media_metrics_network", "media_metrics_pb_metrics", "media_metrics_track_change" into sc-dev 
* changes:
  Unhide media metrics APIs part 2: playback metrics
  Unhide media metrics APIs part 2: Network event
  Unhide media metrics APIs part 2: Track change event
 2021-02-17 22:11:25 +00:00
TreeHugger Robot
742862492c Merge "Fix early registration problem" into sc-dev 2021-02-17 22:03:01 +00:00
Eugene Susla
edacf29ac3 More CDM logging 
Some test failures can be hard to troubleshoot with current (lack of) logs
Adding more logs to CDM

Bug: 180060131
Test: presubmit
Change-Id: Ia57ae584244473fb36e701b1b8a2ba4b7fc69881
 2021-02-17 14:00:28 -08:00
Anna Zappone
4b65ce05ca Add listener for conversation changes 
Add hidden ConversationListener and registration in PeopleManager
for People Tiles to register a listener to individual
conversation storage changes for targetted updates.

Test: DataManagerTest, PeopleServiceTest, PeopleManagerTest
Bug: 178792356
Change-Id: I0cab6913c138d6ac515fed74741dd62bf967772b
 2021-02-17 21:49:32 +00:00
Yan Yan
559fd17ee9 Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d am: 8f2b5071b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d0999c36c05c3bd8e0f6e561cb50cc018936189
 2021-02-17 21:47:45 +00:00
Hunter Knepshield
7c7bb0cb69 Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia937988ef040a85a028ec45d69fad3f291860904
 2021-02-17 21:47:17 +00:00
Yan Yan
e0610fe112 Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d am: 14e64c42ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie04f68e463251668d27d636c77dcd39558125ffb
 2021-02-17 21:46:52 +00:00
Treehugger Robot
94e09fbe6a Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5333980d2af4d3d703fc7bbf1545214697c9841
 2021-02-17 21:46:32 +00:00
Brad Ebinger
abfa62f80b Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf0a66cee2204f7eeb50ea8ce6fe38f2a93b44b
 2021-02-17 21:44:47 +00:00
Yan Yan
8f2b5071b3 Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fedfbd2270ff5dac3e87e1ed83b0607a4ad2c30
 2021-02-17 21:25:35 +00:00
Yan Yan
bf8113b93d Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" 2021-02-17 21:22:57 +00:00
Hunter Knepshield
c47df2e2e9 Merge "Allow optional package names in carrier configs" am: 68612ac556 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11323dffc28c43e9463bd9f0cbcc04fad29f7a6a
 2021-02-17 21:16:18 +00:00
Winson
ede1a4fc13 Fix SettingsXml start tag logic 
Don't move to next tag if the current tag is the START_TAG. The initial
implementation assumed domain verification state would write to a new
XML file, but it ended up being stuffed into packages.xml, so the
start tag is already read in the initial switch that calls into
DomainVerificationService.

Bug: 180527086

Test: atest DomainVerificationPersistenceTest

Change-Id: I623afb08985bf5377cb9ae240805aae5db9cd820
 2021-02-17 13:15:41 -08:00
Kai Shi
0aa410feb9 Merge "Change config_bandwidthEstimateSource to bandwidth_estimator" into sc-dev 2021-02-17 21:14:07 +00:00
Felipe Leme
cf25028c7c Merge "New API: DevicePolicyManager.listForegroundAffiliatedUsers()" into sc-dev 2021-02-17 21:12:16 +00:00
Yan Yan
14e64c42ad Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cda370ffe8babd62d8b7f38a09e35dd947c3384
 2021-02-17 21:10:13 +00:00
Treehugger Robot
4b06a33f7b Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d8da5f999b75a05ce45d2d2fe31e5e0fa0b792f
 2021-02-17 21:07:47 +00:00
Beverly Tai
643b5784e9 Merge changes Ibf5f349c,Ie46d630d into sc-dev 
* changes:
  Update owner info with other keyguard indications
  Add test to allow icon-only messages
 2021-02-17 21:06:25 +00:00
Brad Ebinger
cd59a1a0f3 Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I416fd516d93bd0505e3764fc607a2f5f13c3173e
 2021-02-17 21:04:23 +00:00
Hunter Knepshield
68612ac556 Merge "Allow optional package names in carrier configs" 2021-02-17 20:58:27 +00:00
Hall Liu
a8af60de77 Improve docs for uploadCallComposerPicture 
Add stuff about when this functionality is available and what image
formats are supported.

Fixes: 180419617
Test: docs onle
Change-Id: I541f32a4021deee6848408898186dcffeff81a89
 2021-02-17 12:56:58 -08:00
Sherry Hu
bd771b8f98 Merge "Add null check on UsbManager" into sc-dev 2021-02-17 20:49:34 +00:00