Commit Graph

96323 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Winson Chung
d6e73ec8f1 Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev 2019-12-12 21:27:08 +00:00
Rahul Sabnis
10fd57e659 Merge "Resolve BluetoothDevice hidden API usages by Settings"
am: ce656f7754

Change-Id: I6c9af91fa6338246a872318038dad699c5c3fe04
2019-12-12 13:19:41 -08:00
Treehugger Robot
ce656f7754 Merge "Resolve BluetoothDevice hidden API usages by Settings" 2019-12-12 21:13:46 +00:00
Jordan Liu
d0f439c43b Add API to send background intent
Test: manual
Bug: 144108192
Change-Id: I93c49d377921830a2ae83217a3fbef5026982319
Merged-In: I93c49d377921830a2ae83217a3fbef5026982319
2019-12-12 13:08:12 -08:00
Jeff Sharkey
30b412cab7 Apply Dark theme changes when screen off only
this change waits to apply ui changes after screen off
battery manager sends updates and continuously updates the ui mode

this change also applies external changes to ui configurations when
the mode is actually changed. this resolves some perfromance regression
issues

Fixes: 145694649
Fixes: 145161355
Fixes: 145776479

Test: atest UiModeManagerService
Change-Id: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Merged-In: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
2019-12-12 19:25:07 +00:00
Jeff Sharkey
216c08e460 Apply Dark theme changes when screen off only
this change waits to apply ui changes after screen off
battery manager sends updates and continuously updates the ui mode

this change also applies external changes to ui configurations when
the mode is actually changed. this resolves some perfromance regression
issues

Fixes: 145694649
Fixes: 145161355
Fixes: 145776479

Test: atest UiModeManagerService
Change-Id: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
Merged-In: Ib769df4302d1c09166e2dc456b8ced35daa4d0b7
2019-12-12 18:51:02 +00:00
Automerger Merge Worker
58745b4dcc Merge "Expose CloseGuard as a public API" am: 4314616565 am: 37f8e04de9
Change-Id: I42faa5840cb92a7c5c549e41f5cb03660165d9f4
2019-12-12 18:45:43 +00:00
David Su
37f8e04de9 Merge "Expose CloseGuard as a public API"
am: 4314616565

Change-Id: I57cbf48bdf2edfbca4ebb377307bb2356cce9398
2019-12-12 10:28:42 -08:00
David Su
4314616565 Merge "Expose CloseGuard as a public API" 2019-12-12 18:19:12 +00:00
Automerger Merge Worker
b988967879 Merge "Pipe disabled compat changes to runtime through zygote." am: f33c3a8c9d am: c06f69d2b4
Change-Id: I189518f7abee2013a57c8b76c69e02145ef4238a
2019-12-12 14:22:35 +00:00
Anna Trostanetski
c06f69d2b4 Merge "Pipe disabled compat changes to runtime through zygote."
am: f33c3a8c9d

Change-Id: I25e7c5f7375dfa1d6dc5568e7e32810a4e86e82d
2019-12-12 06:04:52 -08:00
Automerger Merge Worker
161d1764c8 Merge "Handle multiple phoneIds in time detection" am: 51c61e8bdb am: 1602545f28
Change-Id: I75551184a50e7bfe9cebd9b649bfd71acf5ac0f7
2019-12-12 12:27:01 +00:00
Automerger Merge Worker
fead85c4d4 Merge "Make getNetworkSpecifier() public API." am: ad60ef88e0 am: 31f969ba66
Change-Id: I884c4e4c9ed891594845d599358f19f4a8e2ad60
2019-12-12 12:26:06 +00:00
Anna Trostanetski
f33c3a8c9d Merge "Pipe disabled compat changes to runtime through zygote." 2019-12-12 12:15:21 +00:00
Neil Fuller
1602545f28 Merge "Handle multiple phoneIds in time detection"
am: 51c61e8bdb

Change-Id: I6b792aba6ca4ca2f6b43256080e6dff230aca370
2019-12-12 04:08:06 -08:00
Chalard Jean
31f969ba66 Merge "Make getNetworkSpecifier() public API."
am: ad60ef88e0

Change-Id: I92d0b7cb179e1c0f5cb789c2c668254732fbf30a
2019-12-12 04:04:32 -08:00
Neil Fuller
51c61e8bdb Merge "Handle multiple phoneIds in time detection" 2019-12-12 11:33:13 +00:00
Treehugger Robot
ad60ef88e0 Merge "Make getNetworkSpecifier() public API." 2019-12-12 11:29:24 +00:00
Automerger Merge Worker
09fa28fcba Merge "Fix crash after destroyed" into qt-qpr1-dev am: f43740e69c
Change-Id: I4d3b9c90ce380ee6d9494a68a5d5dcc116c61399
2019-12-12 09:55:08 +00:00
TreeHugger Robot
f43740e69c Merge "Fix crash after destroyed" into qt-qpr1-dev 2019-12-12 09:33:41 +00:00
Automerger Merge Worker
ab24f154e2 Merge "Declare ParceledListSlice as generic type" am: ea1b85a5eb am: c48e579ad8
Change-Id: If2de0f0db0c81981e922e96601d20e32b7b4a6d8
2019-12-12 06:24:45 +00:00
Jeongik Cha
c48e579ad8 Merge "Declare ParceledListSlice as generic type"
am: ea1b85a5eb

Change-Id: I9480999780c2ad96e40355e124b597623f1686a6
2019-12-11 22:06:50 -08:00
Jeongik Cha
ea1b85a5eb Merge "Declare ParceledListSlice as generic type" 2019-12-12 06:00:34 +00:00
Chalard Jean
7412d7aa61 Make getNetworkSpecifier() public API.
The builder lets clients set it, and this may be useful for
unit tests of apps. It should be public.
The need arises from uses of this in WiFi and Telephony
network factories.

Test: build
Bug: 135998869
Change-Id: I57279cac139c28e8654d2066ba0c60edd1e6cd98
2019-12-12 13:10:55 +09:00
Automerger Merge Worker
6afb28c9c8 Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244 am: be2826e8dc
Change-Id: I18e07c3ae09432469b8a3a8804b40c76676b64c0
2019-12-11 22:34:14 +00:00
Automerger Merge Worker
bae05149de RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a
Change-Id: Id6995c02dc69230eab7cd1d312c4c4d569e44a25
2019-12-11 21:45:33 +00:00
Automerger Merge Worker
bccb8bec0a RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6
Change-Id: I43130453f6b576679c52be643344589ac624dadd
2019-12-11 21:14:16 +00:00
Rahul Sabnis
d32a94d224 Resolve BluetoothDevice hidden API usages by Settings
Bug: 143245666
Test: Manual
Change-Id: Id34eb275f604e61330aeb91401dc31aeca666b8f
2019-12-11 11:37:05 -08:00
atrost
e44e134776 Pipe disabled compat changes to runtime through zygote.
Test: Java in process API still work correctly - tested locally with test app + adb overrides.
Test: atest com.android.internal.os
Test: atest com.android.server.am
Bug: 145743810
Change-Id: I6645a7ec767400cd579207f0eed1e6e7136c8a6f
Merged-In: I6645a7ec767400cd579207f0eed1e6e7136c8a6f
2019-12-11 18:44:20 +00:00
Automerger Merge Worker
73b581f0dd Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" am: db70de3656
Change-Id: I0a695d10ecca6134e851c0e482af7318de4fdb95
2019-12-11 17:10:03 +00:00
TreeHugger Robot
cb0b5e206d Merge "Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"" into qt-qpr1-dev 2019-12-11 16:57:54 +00:00
Jian Jin
db70de3656 Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"
This reverts commit ba4b561c3e.

Reason for revert: Move to CarSettings

Change-Id: I91fd1fa7dee2400095a014c189a40706b853c471
2019-12-11 00:35:05 +00:00
Automerger Merge Worker
08135b313a Merge "Do not cache enabled tags in Java." am: e280c89075 am: 2dcd338a46
Change-Id: I631b07420837c5271e2162c98d6f2c5150a8528e
2019-12-10 22:56:23 +00:00
Florian Mayer
2dcd338a46 Merge "Do not cache enabled tags in Java."
am: e280c89075

Change-Id: I44cdfc71ccae34ef0975d25881859409924e1363
2019-12-10 14:35:42 -08:00
Automerger Merge Worker
5e1e8b2756 DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings am: ba4b561c3e
Change-Id: I853bb7f04816151b34e7adcd024d31d971561558
2019-12-10 22:34:47 +00:00
TreeHugger Robot
f345ab53bc Merge "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" into qt-qpr1-dev 2019-12-10 22:27:32 +00:00
Treehugger Robot
e280c89075 Merge "Do not cache enabled tags in Java." 2019-12-10 22:26:16 +00:00
Automerger Merge Worker
19f573a89b Merge "Remove usage of IccCardConstants hidden APIs" am: b181ba61e2 am: b09b13cf38
Change-Id: I5a8974d8cd5d2af70996ec60eae924ddd435c840
2019-12-10 22:10:05 +00:00
Jayachandran Chinnakkannu
b09b13cf38 Merge "Remove usage of IccCardConstants hidden APIs"
am: b181ba61e2

Change-Id: Id24383c88deff304c7fbbc0a4b6f95019bf35283
2019-12-10 13:53:13 -08:00