Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
440,364 Commits 3 Branches 0 Tags
d5d2daad18c4dfb89178859d2014ca9bf2bc3652
Commit Graph

440364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d5d2daad18 Merge "Addition of util library" am: 01e54d44b9 am: 0bcbe8861a 
Change-Id: I8a5d86349faaf3a365c9deec265a073efbd47562
 2019-12-13 01:52:08 +00:00
Automerger Merge Worker
204c388017 Merge changes from topic "lmkd_async_msg" am: f802ecca30 am: b2df305e50 
Change-Id: I9471d237340d5a9496a4a5f4401ede6f59432c46
 2019-12-13 01:47:21 +00:00
Automerger Merge Worker
487ebcf2eb Implement ActivityManager to LMKD reconnect functionality am: 80bf49d556 am: 3f6b33b81a 
Change-Id: I957ee0f33ce1f56c8a6bafcf3a39780c5dafa943
 2019-12-13 01:47:10 +00:00
Automerger Merge Worker
686f21bb65 Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am: e8ba34a851 am: a4967992c1 am: 78059be78c 
Change-Id: I80de740d537c1e1f01103b5f22a3a892581c8ac0
 2019-12-13 01:06:14 +00:00
Automerger Merge Worker
a144b42744 RESTRICT AUTOMERGE am: bf04ea6d3b am: bcdf0aacd5 am: c996b91a39 
Change-Id: I43467476ef45235abc5b0a2ef67f942a1823cc1e
 2019-12-13 01:05:57 +00:00
Automerger Merge Worker
1c20fed67e Merge "Update Bluetooth api on SettingsLib" am: bdc1390f27 am: 37f2296023 
Change-Id: Iac44853515c9c1fc86d2dbc03b76804c3c439d5d
 2019-12-13 00:56:23 +00:00
Michele
0bcbe8861a Merge "Addition of util library" 
am: 01e54d44b9

Change-Id: I36919f94fb5fecb0a6410007ebe8b2a07ee6f0bd
 2019-12-12 16:45:28 -08:00
Automerger Merge Worker
78059be78c Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am: e8ba34a851 am: a4967992c1 
Change-Id: I4b60f33db0cb582580f19f82f4af1bebf63a75c1
 2019-12-13 00:44:35 +00:00
Automerger Merge Worker
c996b91a39 RESTRICT AUTOMERGE am: bf04ea6d3b am: bcdf0aacd5 
Change-Id: I32a343ab313d8f61d097f8ce2f705fff355777ef
 2019-12-13 00:44:14 +00:00
Jing Ji
b2df305e50 Merge changes from topic "lmkd_async_msg" 
am: f802ecca30

Change-Id: I105214f7157b680bce028b12a8f437505907a535
 2019-12-12 16:38:39 -08:00
Suren Baghdasaryan
3f6b33b81a Implement ActivityManager to LMKD reconnect functionality 
am: 80bf49d556

Change-Id: Ib17e93917b7217ea15957433c3f5184b48345c2c
 2019-12-12 16:38:30 -08:00
hughchen
37f2296023 Merge "Update Bluetooth api on SettingsLib" 
am: bdc1390f27

Change-Id: Ib04fc9b6a3decd9a7805b3bd60a399b792551526
 2019-12-12 16:33:39 -08:00
Treehugger Robot
01e54d44b9 Merge "Addition of util library" 2019-12-13 00:31:06 +00:00
Automerger Merge Worker
7a21b328b1 Merge "Fix bluetooth icon has wrong color" am: 98deadb73a am: edc1acf2e3 
Change-Id: Ia0e008670e8222e0c2d4d9876edb96251931611b
 2019-12-13 00:28:53 +00:00
Automerger Merge Worker
69b7d95299 Merge changes from topic "cellbroadcastintents" am: 6bcc4db8c0 am: e0c19be377 
Change-Id: I04714fdbe41eeaeb845d7adfb2228a7814447d6e
 2019-12-13 00:27:59 +00:00
Automerger Merge Worker
48ca7bd220 Add API to send background intent am: d0f439c43b am: 10373f032e 
Change-Id: Ic2a496c962ccc2ad2475427adab6dc8dbbf2087c
 2019-12-13 00:27:45 +00:00
Jing Ji
f802ecca30 Merge changes from topic "lmkd_async_msg" 
* changes:
  Support unsolicited message from lmkd
  Implement ActivityManager to LMKD reconnect functionality
 2019-12-13 00:27:38 +00:00
Automerger Merge Worker
a4967992c1 Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev am: e8ba34a851 
Change-Id: Iefe7ac373d783298f608effd81ae50b21053d69c
 2019-12-13 00:26:40 +00:00
Automerger Merge Worker
bcdf0aacd5 RESTRICT AUTOMERGE am: bf04ea6d3b 
Change-Id: I4c99e09d21cd93af567f186ae1e86ab076c96ce3
 2019-12-13 00:26:31 +00:00
Treehugger Robot
bdc1390f27 Merge "Update Bluetooth api on SettingsLib" 2019-12-13 00:25:13 +00:00
TreeHugger Robot
e8ba34a851 Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into qt-dev 
* changes:
  RESTRICT AUTOMERGE Fixes NPE when preparing app data during init
  RESTRICT AUTOMERGE Use KNOWN_PACKAGES when shared lib consumers
  RESTRICT AUTOMERGE Handles null outInfo in deleteSystemPackageLI
 2019-12-13 00:15:10 +00:00
Raff Tsai
edc1acf2e3 Merge "Fix bluetooth icon has wrong color" 
am: 98deadb73a

Change-Id: I83ab00839b20cbd8c5fade82fdec6a6c0e3982ca
 2019-12-12 16:14:10 -08:00
Treehugger Robot
98deadb73a Merge "Fix bluetooth icon has wrong color" 2019-12-13 00:05:57 +00:00
Jordan Liu
e0c19be377 Merge changes from topic "cellbroadcastintents" 
am: 6bcc4db8c0

Change-Id: Idd0a6a63731f996573f51e3343c3165d692d1adc
 2019-12-12 16:02:56 -08:00
Jordan Liu
10373f032e Add API to send background intent 
am: d0f439c43b

Change-Id: I82352ac4247dc785efef4c006a440d56e514f575
 2019-12-12 16:02:48 -08:00
Automerger Merge Worker
4febcb943f DO NOT MERGE Set CarSysUI unprovisioned state depending on SUW progress. am: d185a842c1 
Change-Id: If3c51ad180a84ab656b3d823c7e83d62f09e398c
 2019-12-12 23:44:42 +00:00
Jordan Liu
6bcc4db8c0 Merge changes from topic "cellbroadcastintents" 
* changes:
  Do not modify passed in intent
  Add API to send background intent
 2019-12-12 23:40:13 +00:00
Automerger Merge Worker
2c8f4df701 Merge "Deprecate incorrect year constant" am: 9fbb152eb2 am: 2b446998a1 
Change-Id: I26f759d358c273657f0a0eba180968463e46ac44
 2019-12-12 23:39:47 +00:00
Automerger Merge Worker
675c99fbe4 Merge "Add APN type XCAP" am: 7c03a80247 am: d74193446c 
Change-Id: Ie74716546ce86dc951e411bff829c1f842cfc51e
 2019-12-12 23:39:01 +00:00
Automerger Merge Worker
3bd4e386f1 [automerger skipped] Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" am: 9146586e64 am: 04a332ce6f -s ours 
am skip reason: Change-Id I4509f22cdae656de3ad011de3a1664e27d35986a with SHA-1 aefc64b0f2 is in history

Change-Id: Ib4b205d4ca38b2e84f6cb611bf45b40fbe9d5d6c
 2019-12-12 23:35:15 +00:00
Sarah Chin
aefc64b0f2 Change defaults for FREQUENCY_RANGE and NR_STATE 
Change value from -1 to 0 to match proto

Bug: 141323073
Test: atest TelephonyMetricsTest
Change-Id: I4509f22cdae656de3ad011de3a1664e27d35986a
Merged-In: I4509f22cdae656de3ad011de3a1664e27d35986a
(cherry picked from commit 65277dfec2)
 2019-12-12 23:21:09 +00:00
Charles Munger
2b446998a1 Merge "Deprecate incorrect year constant" 
am: 9fbb152eb2

Change-Id: I5623253402d980b8c105b4fa7a4d622067eaa7fa
 2019-12-12 15:02:01 -08:00
Treehugger Robot
9fbb152eb2 Merge "Deprecate incorrect year constant" 2019-12-12 22:56:13 +00:00
Abhijoy Saha
d185a842c1 DO NOT MERGE Set CarSysUI unprovisioned state depending on SUW progress. 
Use a controller to monitor KEY_SETUP_WIZARD_IN_PROGRESS and USER_SETUP_COMPLETE
flags to know when to set CarSysUI bars in an unprovisioned state and prevent
interactions with notification shade.

Bug: 145616123
Test: Manual
Change-Id: Ie035f049e3e9e7cb411fc9553a20e4c09078c121
 2019-12-12 14:46:57 -08:00
Sarah Chin
d74193446c Merge "Add APN type XCAP" 
am: 7c03a80247

Change-Id: Id55713187f5a244bfc19525320e3aec8e43ade18
 2019-12-12 14:44:58 -08:00
Sarah Chin
7c03a80247 Merge "Add APN type XCAP" 2019-12-12 22:39:01 +00:00
Automerger Merge Worker
bd5c7d5b42 Merge "DO NOT MERGE Defer Hvac initialization until after BOOT_COMPLETED event." into qt-qpr1-dev am: 98e8a9e301 
Change-Id: Iffac8534936baa44d49446e6b4fe22cbab5668e5
 2019-12-12 22:38:32 +00:00
Automerger Merge Worker
ae352243ce DO NOT MERGE Defer Hvac initialization until after BOOT_COMPLETED event. am: c3a8cf4671 
Change-Id: Ie402bafd6e5d9cabc27dd996ff13361c6562fe18
 2019-12-12 22:38:16 +00:00
Automerger Merge Worker
f0cb74314b Merge "Check screenlock for unlock dialog" into qt-qpr1-dev am: 4a03ca6ad1 
Change-Id: I8ab8f5e12e4ec1a14e5f464931a0496ee3483f93
 2019-12-12 22:37:04 +00:00
Youngjun Kwak
98e8a9e301 Merge "DO NOT MERGE Defer Hvac initialization until after BOOT_COMPLETED event." into qt-qpr1-dev 2019-12-12 22:25:14 +00:00
TreeHugger Robot
4a03ca6ad1 Merge "Check screenlock for unlock dialog" into qt-qpr1-dev 2019-12-12 22:23:16 +00:00
Sarah Chin
04a332ce6f Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" 
am: 9146586e64

Change-Id: I8c7ecdd2ef6c1001537d1f06b39daa7713dfcfee
 2019-12-12 14:15:12 -08:00
Sarah Chin
9146586e64 Merge "Change defaults for FREQUENCY_RANGE and NR_STATE" 2019-12-12 22:09:24 +00:00
Jordan Liu
3fd1264acb Do not modify passed in intent 
If the caller wanted to use that intent object after passing it to this
method, it would be mutated in an unexpected way. Instead we create a
copy of the intent and broadcast that.

Bug: 144108192
Test: atest com.android.internal.telephony.CellBroadcastIntentsTest
Change-Id: I89e08b4a50beeb49410521baa9d449b2dc28ecd3
Merged-In: I89e08b4a50beeb49410521baa9d449b2dc28ecd3
 2019-12-12 14:06:59 -08:00
Automerger Merge Worker
85aac1d9d8 Merge "Clamp brightness thresholds to the maximum brightness." into qt-qpr1-dev am: 4274934c01 
Change-Id: Ia9cac1aa7627eda8223f664d6a4a8ae1929a1e63
 2019-12-12 21:52:51 +00:00
Long Ling
4274934c01 Merge "Clamp brightness thresholds to the maximum brightness." into qt-qpr1-dev 2019-12-12 21:48:51 +00:00
Automerger Merge Worker
e06f253e8c Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev am: d6e73ec8f1 
Change-Id: I39643a2f6e7edc9af7221a295eb201cda3244534
 2019-12-12 21:47:54 +00:00
Automerger Merge Worker
7daf421abd Merge "Resolve BluetoothDevice hidden API usages by Settings" am: ce656f7754 am: 10fd57e659 
Change-Id: I001128eba5499a0a080707d00c1627335eae7514
 2019-12-12 21:33:56 +00:00
Automerger Merge Worker
1da70a9076 [automerger skipped] Merge "Add CarrierConfig for roaming PLMNS that will need emer DDS switch" into qt-qpr1-dev am: f275d96b99 -s ours 
am skip reason: Change-Id I4a033f89610fd409ea81c40230938720ca76541c with SHA-1 9fd5576e60 is in history

Change-Id: Ia9d017f75d2456d2f24710db8e6e56cd30a9578b
 2019-12-12 21:30:38 +00:00
Automerger Merge Worker
5e30449863 [automerger skipped] Add CarrierConfig for roaming PLMNS that will need emer DDS switch am: 9fd5576e60 -s ours 
am skip reason: Change-Id I4a033f89610fd409ea81c40230938720ca76541c with SHA-1 f51c917af3 is in history

Change-Id: Icfbfa9c68c1313aa1153c08d03631b9d18a7ab01
 2019-12-12 21:29:41 +00:00