Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
615,375 Commits 3 Branches 0 Tags
599aa30dd783f668f9449fe739abdcc04dea94de
Commit Graph

615375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
0c04c92306 Merge "Add O-O TLMs to top-level owners" 2020-12-10 23:49:46 +00:00
Shawn Willden
ce6b4c47e2 Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." am: f0c3865132 am: 50df7a46cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefc964a514ea1f5a81de0ce573ca7fe99d0fa5ed
 2020-12-10 23:49:39 +00:00
Hui Wang
864505529c Merge "Support Gba Api" am: 4c9e7a8d0c am: 3c7ba99acf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I994f1e7d5f2ce4e018e8f04c7ffcff7d588f50b0
 2020-12-10 23:49:11 +00:00
TreeHugger Robot
684aa6edc0 Merge "Revert^2 Flip BLAST for SurfaceView" 2020-12-10 23:36:26 +00:00
TreeHugger Robot
ab5dac8dc9 Merge "Add initial benchmarks for CanvasOp" 2020-12-10 23:26:27 +00:00
Shawn Willden
50df7a46cf Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." am: f0c3865132 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id049c4ed3ed1ae95fa5c4bc1a12122cf072de0ad
 2020-12-10 23:17:32 +00:00
Beverly
9d90cbddba Hide the lock icon if there's no screen lock 
Don't show the lock icon on the lock screen if the security mode is set
to "none" or "swipe".

Test: manual, atest LockscreenIconControllerTest
Fixes: 172417353
Change-Id: Ida0b85db7aea01b7ab7b5ebae2fe2a2247f64004
 2020-12-10 18:17:20 -05:00
Hui Wang
3c7ba99acf Merge "Support Gba Api" am: 4c9e7a8d0c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67ce3375ffca1e6fa8c62e4a4ce711a20bf17b6f
 2020-12-10 23:07:20 +00:00
Sam Saccone
bf33f70982 Merge "Revert "Temporarily replace "android.com" accounts."" 2020-12-10 23:05:03 +00:00
TreeHugger Robot
c65da8c73f Merge "Camera: improve session.close documentation" 2020-12-10 22:58:33 +00:00
Christopher Tate
546878fbdf Don't suggest now-deprecated APIs 
Suggest getAvailableBlocksLong() instead of the now-deprecated
getAvailableBlocks() method.

Bug: 174799449
Test: m offline-sdk-docs
Change-Id: I34a36e00c3d1a16898b0a6f0a21e4cab9feb0d02
 2020-12-10 22:53:07 +00:00
Shawn Willden
f0c3865132 Merge "Keystore 2.0 SPI: Move keymint spec to security namespace." 2020-12-10 22:49:14 +00:00
Steve Elliott
905ad55193 Fix initialization of SmartReplyView button colors 
Fixes: 171344635
Test: manual
Change-Id: I1366eee5e50d0791ba241436d55d66ea42ac270b
 2020-12-10 17:46:27 -05:00
Jordan Liu
bccf3aa384 Merge "Add API for setting SIM power "synchronously"" am: beb163c655 am: 5a9aa7c8d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a45ac20fc15a41bc59a027b1522f79cc3bc8106
 2020-12-10 22:40:45 +00:00
Hui Wang
4c9e7a8d0c Merge "Support Gba Api" 2020-12-10 22:40:07 +00:00
Jeff Sharkey
e6d38e61cc Merge "configure owners for ShortcutInfo" am: 694df14654 am: 2948fb99c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520446

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27c7ab6c7a1325b43857e1456e631c044ac0d3b5
 2020-12-10 22:39:20 +00:00
Trung Lam
0d2bc8a574 Fix issue with saving protos to disk during shutdown. 
Test: Built and tested on device.
Bug: 172789268
Change-Id: I9cb65e7560f92387e92234929a0b7881f84d7b8f
 2020-12-10 22:24:57 +00:00
Jordan Liu
5a9aa7c8d2 Merge "Add API for setting SIM power "synchronously"" am: beb163c655 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e77e31a9d782a4b19c8f225117bd4d039444c92
 2020-12-10 22:23:07 +00:00
Chris Li
a36573fb1f Merge "Allow TaskDisplayArea to have TaskDisplayArea children (1/n)" 2020-12-10 22:22:50 +00:00
Jeff Sharkey
2948fb99c5 Merge "configure owners for ShortcutInfo" am: 694df14654 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520446

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id396452ae1b631c87cb5797e8d57425143dcb4e6
 2020-12-10 22:18:23 +00:00
Vishnu Nair
a176266651 Only apply the task's pending transaction if it is detached 
This fixes a flicker introduced by 88fbccf which may incorrectly apply
the display content's pending transaction instead of the task's.

Test: go/wm-smoke
Test: app to recents, see no flicker
Change-Id: If0a0431b2ea170ea833c1445599f0fdb9431dabf
 2020-12-10 21:56:58 +00:00
Jordan Liu
beb163c655 Merge "Add API for setting SIM power "synchronously"" 2020-12-10 21:46:30 +00:00
Dmitri Plotnikov
fb62e6388b Merge "Add OWNERS for battery stats directories" 2020-12-10 21:38:21 +00:00
Jeff Sharkey
694df14654 Merge "configure owners for ShortcutInfo" 2020-12-10 21:36:20 +00:00
Chavi Weingarten
98434ff911 Merge changes I91762453,Ic1abc3c0 
* changes:
  Clean up code in WSA and WS
  Send transaction when possible for WSA
 2020-12-10 21:31:46 +00:00
TreeHugger Robot
7efaf6e39b Merge "Grant CHANGE_DEVICE_IDLE_TEMP_WHITELIST to call log provider." 2020-12-10 21:30:51 +00:00
TreeHugger Robot
4e7ec07d7e Merge "Fix import order" 2020-12-10 21:30:38 +00:00
Jorim Jaggi
58ae83981d Add O-O TLMs to top-level owners 
Change-Id: I4785795e4bb9f232ae41674bb56322f5c97871bb
 2020-12-10 21:24:38 +00:00
Daniel Bright
675df99459 Hide NO_THROTTLE_EXPIRY_TIME 
There is no reason to expose NO_THROTTLE_EXPIRY_TIME since
the fact that the apn was not throttle can be explicitly checked
for by checking the throttle type.

Test: N/A
Bug: 175092152
Change-Id: I8888fae0037fd04e1668ab51eff91dd2bcb5e057
 2020-12-10 13:18:11 -08:00
Pinyao Ting
5df24bca42 configure owners for ShortcutInfo 
Bug: 151359749
Test: manual
Change-Id: Ic3f338083402f2c189f36b8ec9db502e11e50a55
 2020-12-10 13:13:26 -08:00
Hansong Zhang
e2654876bf Merge "Bluetooth airplane listener: Check for null" am: 2b7a7f8ec9 am: 38a83f01dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79caa23186d242a98edde73241e629989e8dfbd
 2020-12-10 21:07:20 +00:00
Dmitri Plotnikov
850f34160b Add OWNERS for battery stats directories 
Test: N/A
Change-Id: Ie25835acc58e9246b2a52e92ee34fcc321b0eed1
 2020-12-10 12:58:35 -08:00
TreeHugger Robot
ae05f9703a Merge "Update rotary highlight on bordered buttons" into rvc-qpr-dev am: 773641f557 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6570fc9f05fecc3ca529a06d5e28dadf63e0bdd9
 2020-12-10 20:52:39 +00:00
Hansong Zhang
38a83f01dc Merge "Bluetooth airplane listener: Check for null" am: 2b7a7f8ec9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a364c1c7676fea23feaa9826fb4573c76309108
 2020-12-10 20:52:25 +00:00
Terry Wang
a61f06f831 Merge "Split getInstance and createInstance in AppSearchImpl" 2020-12-10 20:50:48 +00:00
TreeHugger Robot
773641f557 Merge "Update rotary highlight on bordered buttons" into rvc-qpr-dev 2020-12-10 20:48:28 +00:00
Hall Liu
7251ef80d4 Merge "Add APIs for storing pictures in the call log" 2020-12-10 20:46:45 +00:00
Etan Cohen
0c52537880 Merge "[WIFI] Trigger WiFi recovery mode" 2020-12-10 20:42:35 +00:00
Evan Rosky
cf45363705 Merge "Some cleanup/rearrangement of shell transitions things" 2020-12-10 20:37:51 +00:00
Hansong Zhang
2b7a7f8ec9 Merge "Bluetooth airplane listener: Check for null" 2020-12-10 20:36:01 +00:00
Hansong Zhang
b49f866054 Bluetooth airplane listener: Check for null 
Check mAirplaneHelper != null before accessing it.  Note that this can
be null if Settings.Global.RADIO_BLUETOOTH is enabled in
AIRPLANE_MODE_RADIOS.  We don't need to disable Bluetooth if it's
allowed in airplane mode.

Test: atest FrameworksServicesTests
Bug: 174254527
Change-Id: I93ae4ec6b75b7ffb8e75848d7779ab64593221bd
 2020-12-10 20:35:50 +00:00
Sudheer Shanka
93abe7223c Merge "Update BlobStorePerfTests test config." 2020-12-10 20:27:24 +00:00
Darryl L Johnson
61c63d5306 Migrate DisplayFoldController fold state to be based on device state. 
This modifies DisplayFoldController to base it's internal 'fold' state
from being configured directly based on the lid switch (or the proximity
sensor) to be based on the device state.

Bug: 159401801
Test: Manual - fold/unfold and validate fold state

Change-Id: Ib3ecc6326b1d73720d31fa94f33160cfaf1109cd
 2020-12-10 12:24:56 -08:00
Mady Mellor
6673b31638 Use shell executor for TaskView 
Bug: 161980186
Test: atest TaskViewTest
Change-Id: I85764463ada847e2f0c8e82c5744212ee8bb2a9d
 2020-12-10 12:19:09 -08:00
Fabian Kozynski
74bd832ad4 Fix padding in QQS so tiles only move vertically in portrait 
The tiles have extra padding on the side, equal to half the inter tile
space. That way, they are aligned with tiles in QS.

Test: manual
Fixes: 175211959

Change-Id: I291efb06a2c4be49535933abcf4d409709b780b2
 2020-12-10 15:18:56 -05:00
Garfield Tan
41b8b1fab1 Avoid calling getTopMostTask() twice in Task#fillTaskInfo() 
getTopMostTask() is a expensive recursive call that we know won't change
result in a single fillTaskInfo() call, so let's stop calling it twice
in a request.

Bug: 174209413
Test: Builds.
Change-Id: I8239f6e812d41d636573d33f2053bf361db3fc8d
 2020-12-10 12:05:03 -08:00
Dmitry Dementyev
f1e061b2b0 Merge "Add IMMUTABLE flag to AccountManager pending intents." 2020-12-10 20:03:03 +00:00
Evan Rosky
b6569a04c3 Merge "Handle keyguard occlude/unocclude in shell transitions" 2020-12-10 20:02:14 +00:00
Jorge Gil
9e28c670db Merge "Don't save the default size as reentry state" 2020-12-10 20:01:10 +00:00
Serik Beketayev
118f8b9d52 [NetworkPreferenceApp] Initial skeleton 
Bug: 170911632
Test: mma
Change-Id: Ibb3a39bbe3d881a94b80411f324a7b4b0e37f9c3
 2020-12-10 11:56:52 -08:00