drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
451,975 Commits 1 Branch 0 Tags
Commit Graph

451975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
056b8f00b7 Merge "Add Context.createContextAsUser()" 
am: 63d5e4a0b9

Change-Id: I022daba2bc9234ffe7b7fa760942a58852e406b3
 2019-11-20 14:04:20 -08:00
Treehugger Robot
63d5e4a0b9 Merge "Add Context.createContextAsUser()" 2019-11-20 21:53:01 +00:00
Lucas Dupin
9131b28fb1 Remove IBatteryStats call from setDozing 
We should only update the charging state when there's a battery
event. Not whenever we need to refresh the text field.

Fixes: 142959859
Test: manually plug and unplug device
Test: atest KeyguardIndicationControllerTest
Change-Id: I902eb838a1bf81a8c85655423c3ea218a93afd00
 2019-11-20 21:24:41 +00:00
Santiago Seifert
7094b76782 Remove unnecessary jarjar rule from framework/base 
Bug: 144765333
Test: Not applicable.
Change-Id: Ia092b7fb1156652b69080030673b0e8427e745a0
 2019-11-20 20:55:45 +00:00
Andrei-Valentin Onea
f8338a635e [automerger skipped] Merge "Add metrics constant for platform compat UI." into qt-qpr1-dev-plus-aosp 
am: 104112d399 -s ours
am skip reason: change_id I1a1a708596ad003a7c95906fe9514db6ec518dfc with SHA1 1380a56438 is in history

Change-Id: I11cce1964af6d746545e06d5d19650583ca6dd93
 2019-11-20 12:22:29 -08:00
Jay Aliomer
fd4b96a055 Merge "Override default assistant" 2019-11-20 20:08:38 +00:00
Andrei-Valentin Onea
104112d399 Merge "Add metrics constant for platform compat UI." into qt-qpr1-dev-plus-aosp 2019-11-20 20:07:09 +00:00
Evan Laird
013ac3391d [automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev am: 2bb3845dff -s ours am: ff797c3ba3 -s ours am: b868794d17 -s ours am: 0329c19dbf -s ours am: c903d9cfd3 -s ours am: 6e7337a1f8 -s ours 
am: 992eb05fd1 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 09843a687b is in history

Change-Id: Ifaa93da3b42de50ececb9f9243d1ba07f878b6e8
 2019-11-20 12:04:20 -08:00
Andrei Onea
053191eae2 Add metrics constant for platform compat UI. 
Bug: 138280620
Test: builds
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: I1a1a708596ad003a7c95906fe9514db6ec518dfc
Change-Id: I1a1a708596ad003a7c95906fe9514db6ec518dfc
 2019-11-20 20:02:38 +00:00
Evan Laird
992eb05fd1 [automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev am: 2bb3845dff -s ours am: ff797c3ba3 -s ours am: b868794d17 -s ours am: 0329c19dbf -s ours am: c903d9cfd3 -s ours 
am: 6e7337a1f8 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 5136eefeb3 is in history

Change-Id: I3a87635163a61fea0fa9e176ee0d11b766b5a0fe
 2019-11-20 11:56:35 -08:00
Evan Laird
6e7337a1f8 [automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev am: 2bb3845dff -s ours am: ff797c3ba3 -s ours am: b868794d17 -s ours am: 0329c19dbf -s ours 
am: c903d9cfd3 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 5136eefeb3 is in history

Change-Id: Iff93bdfe7f8970a9715f389b4cc42c249070319a
 2019-11-20 11:48:39 -08:00
Evan Laird
c903d9cfd3 [automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev am: 2bb3845dff -s ours am: ff797c3ba3 -s ours am: b868794d17 -s ours 
am: 0329c19dbf -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 5136eefeb3 is in history

Change-Id: Ic804201aae6b091ec28861b1c6904e634155f632
 2019-11-20 11:44:30 -08:00
Sooraj Sasindran
8a4fd6a91b Merge "Add back off timer configs as carrier config" into qt-qpr1-dev am: 772358beb6 
am: 5f230a4c97

Change-Id: I63c26b82740cdfd3ae147b1c7a6675bd2983e5b4
 2019-11-20 11:44:19 -08:00
Sooraj Sasindran
5f230a4c97 Merge "Add back off timer configs as carrier config" into qt-qpr1-dev 
am: 772358beb6

Change-Id: If636a77aad26311092305ab1d090fc982da9af94
 2019-11-20 11:37:21 -08:00
Evan Laird
0329c19dbf [automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev am: 2bb3845dff -s ours am: ff797c3ba3 -s ours 
am: b868794d17 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 5136eefeb3 is in history

Change-Id: I91c96455652ba75033f7bc56fa70d31c0dc019d0
 2019-11-20 11:36:55 -08:00
Evan Laird
b868794d17 [automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev am: 2bb3845dff -s ours 
am: ff797c3ba3 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 3b8c4743f6 is in history

Change-Id: I4236581921e3572b932a95c37a69a062e90b9231
 2019-11-20 11:28:47 -08:00
Oscar Shu
a11e1ce8e1 Merge "Add notification ID for no random mac support" 2019-11-20 19:17:51 +00:00
Sooraj Sasindran
772358beb6 Merge "Add back off timer configs as carrier config" into qt-qpr1-dev 2019-11-20 19:15:13 +00:00
Andrei Onea
e9e83a5554 Add metrics constant for platform compat UI. 
Bug: 138280620
Test: builds
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: I1a1a708596ad003a7c95906fe9514db6ec518dfc
Change-Id: I1a1a708596ad003a7c95906fe9514db6ec518dfc
 2019-11-20 19:10:57 +00:00
Satakshi Rana
fc10659ad8 [automerger skipped] Merge "Passing feedback for screenshots in SysUI" into qt-qpr1-dev am: a681b9d205 
am: b3f8e32d6a -s ours
am skip reason: change_id Ief6400549b30cf1c0c8a374aa443cf6347f84875 with SHA1 aaf695366e is in history

Change-Id: I4f3bac73997ffad27c355cfce472a713a5dce015
 2019-11-20 11:08:51 -08:00
Automerger Merge Worker
ff797c3ba3 [automerger skipped] resolve merge conflicts of 88c651eab144bf64acb1d99f11aabe983f23658c to oc-dr1-dev am: 2bb3845dff -s ours 
am skip reason: Change-Id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA-1 3692a6d231 is in history

Change-Id: I43e5186089d0f40fccdcf9ac85c78f8bda488aac
 2019-11-20 19:05:29 +00:00
Satakshi Rana
b3f8e32d6a Merge "Passing feedback for screenshots in SysUI" into qt-qpr1-dev 
am: a681b9d205

Change-Id: I1134f387c1659f495562dc036ea58943537aa695
 2019-11-20 10:58:27 -08:00
David Su
d9e13e7990 Merge changes from topic "scanreuslt-wifiinfo-systemapi" 
* changes:
  Expose ScanResult/WifiInfo @hide APIs as @SystemApi
  SettingsLib: convert raw fields to getters
  NetworkKey: migrate from ScanResult.wifiSsid to SSID
 2019-11-20 18:57:28 +00:00
Kenny Root
f96836ed3a Move RecoverySystemService into its own package 
This helps reviewing the refactor of the RecoverySystemService in which it
is made a bit more testable.

Test: make && emulator
Change-Id: Ifc5a658fe68ed10ab400f43d1d3967c0acccbd11
 2019-11-20 10:53:39 -08:00
James Mattis
474bf68c0a [automerger skipped] Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218 am: fa968e9691 
am: ed6fe63662 -s ours
am skip reason: change_id I7074278d16beac422ce7b29d4471b2794fa97825 with SHA1 cb157e8a33 is in history

Change-Id: Id22d9c37829a49c089a954bd137d50b6a0564773
 2019-11-20 10:51:16 -08:00
Rahul Sabnis
53ed21a49c [automerger skipped] Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"" into qt-qpr1-dev-plus-aosp 
am: 35505f61a4 -s ours
am skip reason: subject contains skip directive

Change-Id: I16996eced1fb1be735c2ed83fc518a5ddca3742c
 2019-11-20 10:44:17 -08:00
David Su
e51ae1566b NetworkKey: migrate from ScanResult.wifiSsid to SSID 
wifiSsid is an @hide field, migrate to getter method.

Bug: 144311098
Test: atest NetworkKeyTest
Change-Id: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
Merged-In: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
 2019-11-20 10:41:59 -08:00
Satakshi Rana
a681b9d205 Merge "Passing feedback for screenshots in SysUI" into qt-qpr1-dev 2019-11-20 18:40:06 +00:00
James Mattis
ed6fe63662 Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218 
am: fa968e9691

Change-Id: I0efdc1f3fd35fe059747b6ba2c6b0dc1731b3388
 2019-11-20 10:40:05 -08:00
Yinglei Wang
0b60fc71e3 Merge "change CompoundButton button to use the accessibility state API" 2019-11-20 18:37:31 +00:00
James Mattis
fa968e9691 Merge "Swap param order in registerSoftApCallback" 
am: 1dcfd69218

Change-Id: Icfb927efccdab7adda38ca71c30564a29cad785f
 2019-11-20 10:32:33 -08:00
TreeHugger Robot
35505f61a4 Merge "DO NOT MERGE Revert "Merge "Revert "Re-add getAliasName to fix build breakage"" am: 944fed6b66"" into qt-qpr1-dev-plus-aosp 2019-11-20 18:29:09 +00:00
Android Build Merger (Role)
7fbc5bbcb1 Merge "[automerger skipped] Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33 am: 910d4e982a am: 1fa4a358f3 -s ours am skip reason: change_id I7bd15f225ac7774ac6e31c766ee0f11302aae3d8 with SHA1 178267d26b is in history" 2019-11-20 18:22:11 +00:00
Meng Wang
c96b8c197b [automerger skipped] Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33 am: 910d4e982a 
am: 1fa4a358f3 -s ours
am skip reason: change_id I7bd15f225ac7774ac6e31c766ee0f11302aae3d8 with SHA1 178267d26b is in history

Change-Id: Iaf5b9a4a9f86ac3a4fc7f90ee81d5735e457b670
 2019-11-20 10:21:17 -08:00
Jean-Michel Trivi
10891d7809 Merge "AudioDeviceAddress: new class to store audio device information" 2019-11-20 18:20:17 +00:00
James Mattis
1dcfd69218 Merge "Swap param order in registerSoftApCallback" 2019-11-20 18:16:53 +00:00
Artur Satayev
9f41cc03a6 [automerger skipped] Merge "Move resource IDs to greylist-max-q." am: c6d4f0dd69 am: 37a33f67a0 
am: 73bf807a9a -s ours
am skip reason: change_id I851236a8060e05724833d9dbcd4c5a79763d4c40 with SHA1 d52aef7c11 is in history

Change-Id: Ifbb26d0536b638801e05bec1751a6d83672fd265
 2019-11-20 10:14:33 -08:00
Meng Wang
1fa4a358f3 Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33 
am: 910d4e982a

Change-Id: I80e52cfd16d533ccf30587d952040791e37e6263
 2019-11-20 10:14:24 -08:00
Mark Tabry
7a168f0714 [automerger skipped] Merge "Define new atoms for Vehicle Maps Service." into qt-qpr1-dev-plus-aosp 
am: 34af7a8d01 -s ours
am skip reason: change_id I6bf37ed236e81fbcca50046b5a9b649685affb4a with SHA1 a824a64be1 is in history

Change-Id: Ief31d7fa4ba2bcce1908711789f80f4b6591f50b
 2019-11-20 10:12:55 -08:00
TreeHugger Robot
2cb49a0f76 Merge "Remove Dependency.get(MAIN_HANDLER) from NavigationBarFragment" 2019-11-20 18:11:05 +00:00
TreeHugger Robot
56e2bd284f Merge "Remove Dependency.get(MAIN_HANDLER) from NotificationListener" 2019-11-20 18:10:35 +00:00
TreeHugger Robot
e83eb253b1 Merge "Remove Dependency.get(MAIN_HANDLER) from SystemUIService" 2019-11-20 18:10:04 +00:00
TreeHugger Robot
7c8b275096 Merge "Remove Dependency.get(MAIN_HANDLER) from NotificationLockscreenUserManagerImpl" 2019-11-20 18:09:35 +00:00
Dave Mankoff
bba732de8a Remove Dependency.staticOnConfigurationChanged 
ConfigurationChangedReceiver is removed. Classes that want to be
notified of configuration changes should implement
ConfigurationController.ConfigurationListener instead and register
themselves with the ConfigurationController.

Bug: 144782965
Test: atest SystemUITests
Change-Id: Id2c3fe5ae2729b181769fb31b8050da264299d72
 2019-11-20 13:09:27 -05:00
Artur Satayev
73bf807a9a Merge "Move resource IDs to greylist-max-q." am: c6d4f0dd69 
am: 37a33f67a0

Change-Id: I6010fda23167695d88f7a66738f5d45122e33738
 2019-11-20 10:08:26 -08:00
Bill Yi
122eed5d5d Merge "Import translations. DO NOT MERGE" 2019-11-20 18:07:10 +00:00
Meng Wang
910d4e982a Merge "Expose IMSI encryption info APIs as system API" 
am: 0209217e33

Change-Id: Iafce568b8ea8cfc5d499dc21b5bbdc738cbfd3fd
 2019-11-20 10:07:06 -08:00
Meng Wang
a73bed81ae Use TelephonyManager instead of ITelephony Binder 
Bug: 140908357
Test: make
Change-Id: If3be915329cc27c560af3fd71a903984a626aca8
 2019-11-20 10:05:33 -08:00
Artur Satayev
37a33f67a0 Merge "Move resource IDs to greylist-max-q." 
am: c6d4f0dd69

Change-Id: I489fdbe0b6b7ec1a3096b6170645e4227343ce7b
 2019-11-20 10:04:24 -08:00
Mark Tabry
34af7a8d01 Merge "Define new atoms for Vehicle Maps Service." into qt-qpr1-dev-plus-aosp 2019-11-20 18:02:11 +00:00