Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
639,891 Commits 3 Branches 0 Tags
b070fdff7196b3553e0ec57e404282d1010fff82
Commit Graph

639891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Huang
b070fdff71 [automerger skipped] Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f am: 33fdb4a42a am: c4a39c01ac -s ours am: e106440fb2 -s ours 
am skip reason: skip tag Change-Id I5ed1bc8bc8bee5b0c795fd8577a2d64628998e51 with SHA-1 02fda9556d is already in history

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

Change-Id: I16e42f00733f1e79e3a3c969c001564385134d4e
 2021-04-06 15:43:17 +00:00
Aaron Huang
95a5c19c2c [automerger skipped] Migrate hidden API in IpConfigStore to formal API am: 9503a30900 am: f92723b053 am: 3836e2d1c0 -s ours am: 464c65e4b1 -s ours 
am skip reason: skip tag Change-Id Ie9e6af0efe2c39667bb8faa1e3a498b1f61e1432 with SHA-1 509c7361d3 is already in history

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

Change-Id: I5ac328d5630e256c350b43ebcbe94ce4ea7c268f
 2021-04-06 15:43:14 +00:00
Anton Hansson
441c97bf8b Merge "Remove hwbinder" am: 1bf83b28d9 am: 2f3ad490b1 am: bf856b1aa1 am: 7071e29172 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658059

Change-Id: Ie0df1462252d797e73f622db2628c94de7ff251e
 2021-04-06 15:42:41 +00:00
Aaron Huang
e106440fb2 [automerger skipped] Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f am: 33fdb4a42a am: c4a39c01ac -s ours 
am skip reason: skip tag Change-Id I5ed1bc8bc8bee5b0c795fd8577a2d64628998e51 with SHA-1 02fda9556d is already in history

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

Change-Id: Id8ab6d21ab2ffab8932ceab53ddd1fdb8da8f800
 2021-04-06 15:26:50 +00:00
Aaron Huang
464c65e4b1 [automerger skipped] Migrate hidden API in IpConfigStore to formal API am: 9503a30900 am: f92723b053 am: 3836e2d1c0 -s ours 
am skip reason: skip tag Change-Id Ie9e6af0efe2c39667bb8faa1e3a498b1f61e1432 with SHA-1 509c7361d3 is already in history

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

Change-Id: I91ca8eea0961a388e5a13bdeba39962c5d170d98
 2021-04-06 15:26:40 +00:00
Anton Hansson
7071e29172 Merge "Remove hwbinder" am: 1bf83b28d9 am: 2f3ad490b1 am: bf856b1aa1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658059

Change-Id: Iae9a0ce89f495f9aa15d21c68790cd5d310bebea
 2021-04-06 15:26:02 +00:00
Jeff DeCew
e64188096b Merge "Do not highlight group expanders" into sc-dev am: 6a39b82e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14068211

Change-Id: I134e6d7c98a3f9ef96d6c7095f320191285c5e82
 2021-04-06 15:23:55 +00:00
TreeHugger Robot
a24ac8557c Merge "Add the IntRange and IntDef annotations for initial text API" into sc-dev am: 4d2caded83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14062694

Change-Id: I385a722964f0af7e6576b35effe349b706d94e0c
 2021-04-06 15:23:28 +00:00
Kweku Adams
785c68cc4c Merge "Check network blocked reasons for job satisfaction." into sc-dev am: 9496d1170a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14078446

Change-Id: I0a66186c3a7cc9dfbf87fcb2e1318c0211b47253
 2021-04-06 15:22:15 +00:00
Jeff DeCew
6a39b82e8b Merge "Do not highlight group expanders" into sc-dev 2021-04-06 15:10:57 +00:00
TreeHugger Robot
4d2caded83 Merge "Add the IntRange and IntDef annotations for initial text API" into sc-dev 2021-04-06 15:10:46 +00:00
Kweku Adams
9496d1170a Merge "Check network blocked reasons for job satisfaction." into sc-dev 2021-04-06 15:04:01 +00:00
TreeHugger Robot
a475e12d5a Merge "Enable smartspace" into sc-dev am: 83bfac2e6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13952009

Change-Id: Iee8446e1c60b5c71c50690d66b4b8c80941188d8
 2021-04-06 15:02:01 +00:00
Jeff DeCew
ee0b56b0cf Merge "Fix all RemoteInputView colors when isColorized changes." into sc-dev am: d7e2194d22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14093446

Change-Id: Ibe604c9383f2bb00b906c297b0297e7ff576f500
 2021-04-06 15:01:42 +00:00
TreeHugger Robot
83bfac2e6d Merge "Enable smartspace" into sc-dev 2021-04-06 14:57:34 +00:00
Jeff DeCew
d7e2194d22 Merge "Fix all RemoteInputView colors when isColorized changes." into sc-dev 2021-04-06 14:44:26 +00:00
Aaron Huang
c4a39c01ac Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f am: 33fdb4a42a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290

Change-Id: Ia0f9ad67aaf675e8190d52e5814dbe855021a8b3
 2021-04-06 14:41:28 +00:00
Aaron Huang
3836e2d1c0 Migrate hidden API in IpConfigStore to formal API am: 9503a30900 am: f92723b053 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577123

Change-Id: I7ef352c7213864ee2ff99c5a2517fb1b9e68d1d2
 2021-04-06 14:41:24 +00:00
Anton Hansson
bf856b1aa1 Merge "Remove hwbinder" am: 1bf83b28d9 am: 2f3ad490b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658059

Change-Id: Ie74fb08f20c99d932002f5305c8622a271534055
 2021-04-06 14:40:46 +00:00
Zimuzo Ezeozue
bb13fef8c4 Merge "Fix secondary volume mounts on user switch" into sc-dev am: bda154d565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018885

Change-Id: I1560c8458e35d8e52ee2cdf3d30032773e6cc999
 2021-04-06 14:24:45 +00:00
Anna Zappone
61af09d282 Merge "Update strings for People Tiles & priority flow" into sc-dev am: 7d0422a7ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019209

Change-Id: Id6830541dc5193d1e641e3fadaa414594b5ab82e
 2021-04-06 14:23:49 +00:00
Aaron Huang
3f2b1f7a78 [automerger skipped] Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89 am: 06007f0302 am: 4a14451368 -s ours am: db94cf9c99 -s ours 
am skip reason: skip tag Change-Id I4341e177b61df0311f0a3234f8814a0ae2cf9a1b with SHA-1 62718c2bbf is already in history

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

Change-Id: Ie27a42480eeffbd3360072b78b6e56e0721451a4
 2021-04-06 14:23:32 +00:00
Almaz Mingaleev
6fab2f477c Merge "Use isShownInPickerAt instead of isShownInPicker." am: bc3fff46d9 am: 7851e524e7 am: e314e455b3 am: bcb4204697 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655727

Change-Id: I7e5d8d1a3064c9f8534338555d7f69c1df978b69
 2021-04-06 14:20:59 +00:00
Zimuzo Ezeozue
bda154d565 Merge "Fix secondary volume mounts on user switch" into sc-dev 2021-04-06 14:18:50 +00:00
Anna Zappone
7d0422a7ca Merge "Update strings for People Tiles & priority flow" into sc-dev 2021-04-06 14:13:15 +00:00
Aaron Huang
33fdb4a42a Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290

Change-Id: I9fe40b60f31f0897f8cb62a39787536cd5524157
 2021-04-06 14:06:51 +00:00
Aaron Huang
f92723b053 Migrate hidden API in IpConfigStore to formal API am: 9503a30900 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577123

Change-Id: I218559824dc81cc1b57f17ef43f3fb29ec0fc4f5
 2021-04-06 14:03:54 +00:00
Aaron Huang
db94cf9c99 [automerger skipped] Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89 am: 06007f0302 am: 4a14451368 -s ours 
am skip reason: skip tag Change-Id I4341e177b61df0311f0a3234f8814a0ae2cf9a1b with SHA-1 62718c2bbf is already in history

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

Change-Id: Ie976da216d8a83306a4a4c5641f39b6e73c71c1e
 2021-04-06 14:03:42 +00:00
Almaz Mingaleev
bcb4204697 Merge "Use isShownInPickerAt instead of isShownInPicker." am: bc3fff46d9 am: 7851e524e7 am: e314e455b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655727

Change-Id: I6fc3e9784eeb85de32b26e6bd56c7e7f661aeb33
 2021-04-06 14:03:13 +00:00
Matt Pietal
f308de4ed3 Merge "Controls in QS" into sc-dev am: f6b558659b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14077816

Change-Id: Ib8fb2c2f8ca4a1b11e7b7e796404c6beb1f08d2f
 2021-04-06 13:59:32 +00:00
George Chang
b1e2e07694 Merge "Fix MSG_REQUIRE_NFC_UNLOCK case" into sc-dev am: 7d0075c9f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14100405

Change-Id: Idbfea268c018b77bfc1bdc1d3f1ab696fb8d0a4b
 2021-04-06 13:59:13 +00:00
Wu Ahan
c1c41be8c7 Merge "End the trace section while the surface has destroyed" into sc-dev am: 790f33d571 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13981701

Change-Id: I5dc78441b9462c76821eb49c59e5529e4f01ee6c
 2021-04-06 13:58:42 +00:00
Anton Hansson
2f3ad490b1 Merge "Remove hwbinder" am: 1bf83b28d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658059

Change-Id: I4372d07c0270ee80794ff2df7a6d41030efa8ea1
 2021-04-06 13:58:41 +00:00
Matt Pietal
f6b558659b Merge "Controls in QS" into sc-dev 2021-04-06 13:55:32 +00:00
George Chang
7d0075c9f8 Merge "Fix MSG_REQUIRE_NFC_UNLOCK case" into sc-dev 2021-04-06 13:43:11 +00:00
Wu Ahan
790f33d571 Merge "End the trace section while the surface has destroyed" into sc-dev 2021-04-06 13:36:37 +00:00
Aaron Huang
834026197f Merge changes I5ed1bc8b,Ie9e6af0e 
* changes:
  Fix IpConfigStore dependencies on framework-connectivity
  Migrate hidden API in IpConfigStore to formal API
 2021-04-06 13:20:26 +00:00
Aaron Huang
4a14451368 Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89 am: 06007f0302 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664305

Change-Id: If0e78b4bdce820f9eb22f231f57d5ce841005328
 2021-04-06 13:18:58 +00:00
Louis Chang
cf4b6e4e2d Merge "Fixes unable to start recents activity" into sc-dev am: e4e799c79e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14097768

Change-Id: I5d38b09387efd118d4524cb987fd9406effb831f
 2021-04-06 13:18:43 +00:00
Almaz Mingaleev
e314e455b3 Merge "Use isShownInPickerAt instead of isShownInPicker." am: bc3fff46d9 am: 7851e524e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655727

Change-Id: I697840a9acc711fe18e1c08d11f06b50339728fd
 2021-04-06 13:18:31 +00:00
Julia Reynolds
50209e4377 Merge "Restrict alarm broadcast" into sc-dev am: 9f72c9fdd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14095376

Change-Id: I5ce63bb655b8f6c8359986177d1f281f2d158624
 2021-04-06 13:18:22 +00:00
Louis Chang
e4e799c79e Merge "Fixes unable to start recents activity" into sc-dev 2021-04-06 13:15:33 +00:00
Anton Hansson
1bf83b28d9 Merge "Remove hwbinder" 2021-04-06 13:08:56 +00:00
Julia Reynolds
9f72c9fdd1 Merge "Restrict alarm broadcast" into sc-dev 2021-04-06 12:51:20 +00:00
Aaron Huang
06007f0302 Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664305

Change-Id: Ic3fca6892c37636dfc0e8470b8e663fda3dfd51a
 2021-04-06 12:42:00 +00:00
Almaz Mingaleev
7851e524e7 Merge "Use isShownInPickerAt instead of isShownInPicker." am: bc3fff46d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655727

Change-Id: I5e2fec1d9494e741da6f80ef2afd312859dddfc5
 2021-04-06 12:37:07 +00:00
Oli Lan
50d5cacf6a Merge "Pass AttributionSource to bluetooth scanning methods." into sc-dev am: 53bdb4b8c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14064505

Change-Id: I14925015f5f6198944a403b55614270899d4638d
 2021-04-06 12:35:53 +00:00
Aaron Huang
248a42ca89 Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" 2021-04-06 12:27:53 +00:00
Oli Lan
53bdb4b8c0 Merge "Pass AttributionSource to bluetooth scanning methods." into sc-dev 2021-04-06 12:16:32 +00:00
Martijn Coenen
21b5790139 Merge "Fix StorageVolume creation for clone users." into sc-dev am: 11ce311d5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14057086

Change-Id: I58aa63e0cb94e5501dedc585dd02cfe81513e8cf
 2021-04-06 12:14:42 +00:00