Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
627,640 Commits 3 Branches 0 Tags
32be4ae9ffd2fcdcf03d7ac016b8dcc623cf1224
Commit Graph

627640 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soonil Nagarkar
32be4ae9ff Merge "Use full identity instead of package in historical stats" into sc-dev am: 2e0c80b260 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13662836

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida44badc63634bb8d75fcc1b34da93cf8bc0a0b1
 2021-02-24 21:17:05 +00:00
Kweku Adams
e398f6c001 Merge "Make sure EJ rewarding quota works." into sc-dev am: 01af9eec33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13679727

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I509c8b5df4638e3ffc4b3b237229981b364ce9d0
 2021-02-24 21:16:14 +00:00
Soonil Nagarkar
2e0c80b260 Merge "Use full identity instead of package in historical stats" into sc-dev 2021-02-24 19:48:53 +00:00
Kweku Adams
01af9eec33 Merge "Make sure EJ rewarding quota works." into sc-dev 2021-02-24 19:27:29 +00:00
Bob Badour
daf1e19524 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev am: 745e7ee830 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13670655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e50f0a5bd502801cbf5e5a00fca32347e9c1e54
 2021-02-24 18:58:06 +00:00
Peter Kalauskas
92432693a2 Merge changes I3f3f10e8,I527e401b into sc-dev am: 9bcd1aef22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13608825

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If36835b79f817d334aaf603f1454dc38058978bf
 2021-02-24 18:57:54 +00:00
Lyn Han
c72b3e8489 Merge "Reorder bubbles without animations on collapse" into sc-dev am: 26e6b76d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13665681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I754e00b34a283251d8a500429d1b672560af3f09
 2021-02-24 18:57:40 +00:00
Bob Badour
745e7ee830 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev 2021-02-24 18:43:29 +00:00
Peter Kalauskas
9bcd1aef22 Merge changes I3f3f10e8,I527e401b into sc-dev 
* changes:
  Fade background when keyguard user switcher open
  Use correct keyguard margin clock position algorithm
 2021-02-24 18:41:29 +00:00
Lyn Han
26e6b76d99 Merge "Reorder bubbles without animations on collapse" into sc-dev 2021-02-24 18:38:37 +00:00
Lyn Han
95089b6d65 Reorder bubbles without animations on collapse 
Fixes: 180045233
Test: select different bubble while expanded, collapse stack
     => see that newly selected bubble is on top of stack
     => no weird animations like in b/178499353
Change-Id: I6d95763a4dd08fd8d1e30dd93131ff27b4fd7c2c
 2021-02-24 18:38:13 +00:00
Tom Taylor
6ec13b064b Merge "Add messageId to both of the MMS methods" into sc-dev am: 1f21265785 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474150

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bb50038ac9c84ec6f6ba15be2503b8354feb8bb
 2021-02-24 18:09:10 +00:00
Dan Saadati
9cf8f8adc5 Merge "Update AppSearchManager class header with description and examples" into sc-dev am: 11924878af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13619085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie16b2db03b501cae4fe566a9a297ed287405cc2a
 2021-02-24 18:08:23 +00:00
Tom Taylor
1f21265785 Merge "Add messageId to both of the MMS methods" into sc-dev 2021-02-24 18:07:24 +00:00
Dan Saadati
11924878af Merge "Update AppSearchManager class header with description and examples" into sc-dev 2021-02-24 17:56:30 +00:00
Sarah Chin
5a5fb6a4f2 Merge "APIs for 5G slicing" into sc-dev am: 02be60c442 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13483692

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I323b9835d70f1b6a0047d370b768b6dd5e5143b6
 2021-02-24 17:55:24 +00:00
Jorim Jaggi
b322d8d363 Merge "Revert to previous metric for jank reporting" into sc-dev am: 36540883a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13687787

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e3f054362f76717ca0e9948a8aca487a0e4201a
 2021-02-24 17:54:39 +00:00
Daniel Sandler
2734c3df4a Merge "Verbose touch debugging for the status bar." into sc-dev am: fadb4547b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13683951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia403743cd66eebd3a73c67c777661e8a412ccff4
 2021-02-24 17:54:11 +00:00
Artur Satayev
8ae6d00797 Merge "Revert "Enable @TestApi access for instrumentation."" into sc-dev am: 6577a29794 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676889

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafff39030051c1f8fa2e4ca96996e342826321ea
 2021-02-24 17:51:25 +00:00
Sarah Chin
02be60c442 Merge "APIs for 5G slicing" into sc-dev 2021-02-24 17:36:45 +00:00
Jorim Jaggi
36540883a2 Merge "Revert to previous metric for jank reporting" into sc-dev 2021-02-24 17:17:51 +00:00
Daniel Sandler
fadb4547b6 Merge "Verbose touch debugging for the status bar." into sc-dev 2021-02-24 17:16:34 +00:00
Artur Satayev
6577a29794 Merge "Revert "Enable @TestApi access for instrumentation."" into sc-dev 2021-02-24 17:10:54 +00:00
TreeHugger Robot
b248515e03 Merge "Add edge effect type accessors for views that support it" into sc-dev am: e4c9e20df0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13664170

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9703a9137f3192a7edcaad42c095c679ee1d9324
 2021-02-24 16:55:09 +00:00
Brian Stack
22258c9b5c Merge "Remove unnecessary UWB functions" into sc-dev am: baba083691 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13666616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2921cf0815a7bab3cf73eca89430b4bf122e51a
 2021-02-24 16:54:53 +00:00
Kweku Adams
6af27236c3 Merge "Revert "Dump most recently completed jobs."" into sc-dev am: 2d3ea22596 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13678904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I462fa489037ddb3dfd9a7e0d6f841d93953b144f
 2021-02-24 16:54:43 +00:00
TreeHugger Robot
e4c9e20df0 Merge "Add edge effect type accessors for views that support it" into sc-dev 2021-02-24 16:32:07 +00:00
Brian Stack
baba083691 Merge "Remove unnecessary UWB functions" into sc-dev 2021-02-24 16:11:53 +00:00
Kweku Adams
2d3ea22596 Merge "Revert "Dump most recently completed jobs."" into sc-dev 2021-02-24 16:09:17 +00:00
Santos Cordon
af171dd74c Merge "Send display-OFF event if that is initial state." into sc-dev am: 7fe46bae14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13583070

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76425dd254ad0ef71338efe29d1bd8b36dbcd87d
 2021-02-24 15:59:15 +00:00
Pavel Grafov
3c4d1f8234 Merge "Keystore 2.0: Remove attestKey from KeyChain." into sc-dev am: d00355cd6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657290

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85915da582cad2555f0e9a766a0a2f0c4c104cb9
 2021-02-24 15:58:06 +00:00
Jorim Jaggi
0ac066de5b Revert to previous metric for jank reporting 
Test: adb shell dumpsys gfxinfo com.android.systemui
Fixes: 180959287
Change-Id: I47deb32b61c6a49a720946447c4fc48b9779d58a
 2021-02-24 16:28:47 +01:00
Santos Cordon
7fe46bae14 Merge "Send display-OFF event if that is initial state." into sc-dev 2021-02-24 15:05:38 +00:00
Pavel Grafov
d00355cd6a Merge "Keystore 2.0: Remove attestKey from KeyChain." into sc-dev 2021-02-24 15:04:11 +00:00
Jamie Garside
155a5da570 Merge "Revert "Update the bouncer to be able to move to either side of a wide screen."" into sc-dev am: 5f630223cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676711

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3366c9db9ee1d0eac085da79cd097080ba4cac74
 2021-02-24 13:46:06 +00:00
Jamie Garside
5f630223cc Merge "Revert "Update the bouncer to be able to move to either side of a wide screen."" into sc-dev 2021-02-24 13:32:25 +00:00
Anton Hansson
0b7742adc0 Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev am: eaeaf0acac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52edb7aeb545249eee78a59415a096b9e8426262
 2021-02-24 13:15:02 +00:00
Anton Hansson
eaeaf0acac Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev 2021-02-24 12:27:18 +00:00
Santos Cordon
a60654e05c Send display-OFF event if that is initial state. 
Local Displays have always sent an initial state of something
other than OFF.  With foldables, thats not the case any more so
don't ignore state_off events if the device's state was previously
UNKNOWN.

Bug: 178713651
Test: manual, atest com.android.server.display
Change-Id: Icc426c289e59aad43dc5d6fb0033fbbc887b0270
 2021-02-24 11:49:53 +00:00
Josh Hou
44a18e0c24 Merge "Replace Handler with Executor" into sc-dev am: 53863bbcbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13668805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97dce36cca9b386890c18885bfc8dc16071067b4
 2021-02-24 10:43:27 +00:00
Kholoud Mohamed
de5288d3ac Merge "Expose setBindAppWidgetPermission as a testAPI" into sc-dev am: c3406718ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13567146

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ee8edf5d045b6610d52e9e0a1021881ea0ee825
 2021-02-24 10:42:54 +00:00
Orion Hodson
7a039026f6 Merge "Fix warning about recursive loading of libmedia_jni.so" into sc-dev am: a6d52d2e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13640158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8febfc7fa0f168d69a397e05b4f5298940584c7
 2021-02-24 10:42:39 +00:00
Josh Hou
53863bbcbf Merge "Replace Handler with Executor" into sc-dev 2021-02-24 10:40:30 +00:00
Kholoud Mohamed
c3406718ef Merge "Expose setBindAppWidgetPermission as a testAPI" into sc-dev 2021-02-24 10:24:25 +00:00
Orion Hodson
a6d52d2e9a Merge "Fix warning about recursive loading of libmedia_jni.so" into sc-dev 2021-02-24 10:11:39 +00:00
Junyu Lai
63d3153c23 Merge "Revert "Add API to let apps color CallStyle notifications themse..."" into sc-dev am: 1d57fc25ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676333

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23293fb6b21937bcfdaaf3a48af3f3cf7a3cdabb
 2021-02-24 08:56:27 +00:00
Junyu Lai
1d57fc25ae Merge "Revert "Add API to let apps color CallStyle notifications themse..."" into sc-dev 2021-02-24 08:04:34 +00:00
Robert Shih
e7ff0d76ea Merge "MediaCryptoException: human readable error codes" into sc-dev am: f5e313dc1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13639134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a34cb77085d1135cefeb29c81eb83cde0e52985
 2021-02-24 07:00:42 +00:00
Stanley Wang
026939d12c Merge "Update MainSwitch widget." into sc-dev am: 359919c32d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473185

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If000f4ba64ce9aa9163e6141f8ecafaeee32b0e0
 2021-02-24 06:58:51 +00:00
Junyu Lai
04ae75a461 Revert "Add API to let apps color CallStyle notifications themse..." 
Revert "Add CTS tests for CallStyle, including setting color hints."

Revert submission 13661867-call_style_colors

Reason for revert: Possible culprit of b/181087733
Reverted Changes:
I537191e7c:Add API to let apps color CallStyle notifications ...
I8bd00b8c2:Add CTS tests for CallStyle, including setting col...

Change-Id: Ia8699f6ef151000212606bea598a2abefa6b53a7
 2021-02-24 06:26:19 +00:00