Automerger Merge Worker
a8c2f1cb3c
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 306f776fc3
...
Change-Id: I6286e372401c62919998401972401b6ddf616a7b
2020-03-05 08:18:13 +00:00
Automerger Merge Worker
087e60ca06
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
...
Change-Id: I650985673b4c7401f5da545f8175f9baddb5f864
2020-03-05 08:08:41 +00:00
Automerger Merge Worker
306f776fc3
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
...
Change-Id: I975aec9390ad68c3b38a56f2c79d6c66030c9e95
2020-03-05 08:08:38 +00:00
TreeHugger Robot
e8f1c6c814
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev
2020-03-05 07:53:51 +00:00
Automerger Merge Worker
9fe8ed6ec5
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 15d36aeddc
...
Change-Id: Ia7319a098711fa2ca8377ee79e5bf65621c6b3f8
2020-03-05 06:13:00 +00:00
Automerger Merge Worker
fcf2bfd780
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
...
Change-Id: I07d101be57afe83940da8864d8dbc977d9037eb0
2020-03-05 06:12:37 +00:00
Automerger Merge Worker
15d36aeddc
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
...
Change-Id: I558b9d04bab94d072ff325937966f8dfb813465e
2020-03-05 05:58:56 +00:00
Automerger Merge Worker
3cd1238aff
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
...
Change-Id: Ie52a859080d88cf517ed92615a52be9b4086087e
2020-03-05 05:58:56 +00:00
Tim Peng
c88dc498e8
Add getSessionName() API for group name in worker
...
Bug: 150827723
Test: make -j50 RunSettingsRoboTests
Change-Id: Id09cb61b8ce23520761252fbb8ffbe3e323adf8e
2020-03-05 13:49:04 +08:00
tim peng
5578920e4c
Merge "Add package name when launching output switcher from remote slice" into rvc-dev
2020-03-05 05:45:44 +00:00
Tsung-Mao Fang
2fc9fed89c
Fix pendingIntent in SettingsSliceProvider could be Hijacked
...
A malicious app is able to obtain this pending intent.
It can then mutate all fields except for the action and
launch the intent. This can be used to launch any activity
with the ACTION_SETTINGS action.
So, we enfore assign the package name for this intent,
it only can launch the settings app.
Fix: 147355897
Test: a) Install the new settings apk, and it won't launch other screen.
(See details in bug)
b) Start the settings search, slice search results work as normal.
Change-Id: Ie954d8a4b7153d6a4cac40621f363b45185990f2
(cherry picked from commit b3c0a2a6c1
)
Merged-In: Ie954d8a4b7153d6a4cac40621f363b45185990f2
2020-03-05 05:38:55 +00:00
Automerger Merge Worker
74b81bd431
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 4a4ee98a19
...
Change-Id: I3995539b6b63616764291714de5d2df8bbc77198
2020-03-05 03:30:35 +00:00
Automerger Merge Worker
d1cf39086a
Merge "Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: 35014d26ed" into rvc-d1-dev-plus-aosp
2020-03-05 03:28:52 +00:00
Automerger Merge Worker
1e3e1fe4f4
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
...
Change-Id: I8b3359b2c4f2976a5c63bc78315b0931b2c06f27
2020-03-05 03:28:48 +00:00
Automerger Merge Worker
447f2482d4
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: 35014d26ed
...
Change-Id: Ic5cd562b1834f5284f317ceda6814ca5490870cd
2020-03-05 03:28:16 +00:00
Automerger Merge Worker
2a989e2f83
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
...
Change-Id: I9d4de8e2af90e51edccac80ca0284cee04cb6513
2020-03-05 03:27:45 +00:00
Automerger Merge Worker
4a4ee98a19
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
...
Change-Id: I50df00daa2471adc120a9934febc4554a3608bde
2020-03-05 03:15:33 +00:00
Automerger Merge Worker
60bc99d812
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
...
Change-Id: I246edbade67850ad044e7d7532c8cdde3c40ce32
2020-03-05 03:15:24 +00:00
Automerger Merge Worker
35014d26ed
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
...
Change-Id: I4f9570ea05ef71ae565fc1950c766f3d7bd8b618
2020-03-05 03:15:14 +00:00
Automerger Merge Worker
ccfe8c6624
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
...
Change-Id: I50f84bf17daa3fc36b2bc40c953fe398ee5e34ad
2020-03-05 03:14:56 +00:00
Zhen Zhang
042aa85b50
Merge "Update SharedPreference values based on tethering state" into rvc-dev
2020-03-05 02:58:24 +00:00
TreeHugger Robot
d9f611fe6b
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev
2020-03-05 02:57:24 +00:00
changbetty
081414e84d
[Telephony Setting] Enable the Settings test case
...
Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AirplaneModePreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkPreferenceControllerTest
Change-Id: I192385b1d847323d18ebc621f29ccc65cd7473d8
2020-03-05 10:21:54 +08:00
Steven Liu
cc6eb5c0f7
Remove the unnecessary dependent on WifiTrackerLib.
...
Bug: 150467119
Test: build
Change-Id: I947d4ee2f88aadc2d8b2002a2c5b04f60c4d853b
2020-03-04 14:51:27 -08:00
Automerger Merge Worker
319779dcc6
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: c49ada9182
-s ours am skip reason: subject contains skip directive" into rvc-d1-dev-plus-aosp
2020-03-04 21:24:28 +00:00
Automerger Merge Worker
24de3fbf97
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: c49ada9182
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I194b0cac70dc5a0b1a364e9ceb559df9962f9985
2020-03-04 21:24:25 +00:00
Automerger Merge Worker
318fcbbd52
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours am: ff29ca26c5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iad4a9c8271bf2f3d34c9d451fb2fc6b90e2de27f
2020-03-04 21:24:23 +00:00
Automerger Merge Worker
c49ada9182
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibd939d46e2bcc31623f69049c6a06015e39c137a
2020-03-04 21:13:02 +00:00
Automerger Merge Worker
ff29ca26c5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: b79218f56d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3a70d3e9d49991434380da5f9b72baa50a0f916d
2020-03-04 21:12:53 +00:00
TreeHugger Robot
b79218f56d
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-04 20:59:22 +00:00
Automerger Merge Worker
ed8a3467a3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: 306d47bca5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5db4fafec9e8f1745b3c0b842442593888135e16
2020-03-04 20:11:05 +00:00
Automerger Merge Worker
479eb958c8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours am: b43406147b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I204cea9f138462beb6b0ffca74df7e3b46e0a354
2020-03-04 20:10:50 +00:00
Automerger Merge Worker
306d47bca5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5977827c3ebecc7f3055d491922d875f6f8a88a3
2020-03-04 19:53:34 +00:00
Automerger Merge Worker
b43406147b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours am: e0bc29df11
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifdeb07456af76024e651cf6723c71bcb037762f8
2020-03-04 19:53:27 +00:00
Automerger Merge Worker
e0bc29df11
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3779025590
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I98d470799b1ddddd9cc497d4f3729f2d04fd613c
2020-03-04 19:40:30 +00:00
TreeHugger Robot
3779025590
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-03-04 19:24:28 +00:00
Zhen Zhang
0c02d33818
Update SharedPreference values based on tethering state
...
TetherEnabler need to update tethering state of each tethering
interfaces to make sure other preferences that depends on these
SharedPreferences be consistent with UI.
Bug: 148968321
Test: TetherEnablerTest; CodeInspectionTest. Manully test, built and
flashed to crosshatch device.
Change-Id: Ie0be7748adf20e6fb0ff5489795b0ca0664b6323
2020-03-04 10:59:29 -08:00
Automerger Merge Worker
c3b6944712
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: 12d9e009a6
...
Change-Id: Ic81ddc2f3e51169d0b662df8a11aedc6c95ab34c
2020-03-04 18:27:10 +00:00
Automerger Merge Worker
57e5809c32
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: fe6755ec7f
...
Change-Id: Ia5ee80e7c4c9d03d6f541fe075d4826ef90659fd
2020-03-04 18:25:38 +00:00
Automerger Merge Worker
fe6755ec7f
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
...
Change-Id: Ib65f8a21f5b9dc1bfcd2ecf1b66ea43747ec1774
2020-03-04 18:16:07 +00:00
Automerger Merge Worker
12d9e009a6
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
...
Change-Id: I4eed6959e7c36171a7df1a37ce9087166ba75418
2020-03-04 18:06:25 +00:00
Brad Ebinger
6bdf1393f8
Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev
2020-03-04 18:05:25 +00:00
Automerger Merge Worker
93375e2f15
Merge "Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
am: 3a3d457968" into rvc-d1-dev-plus-aosp
2020-03-04 17:30:20 +00:00
Automerger Merge Worker
82f87f0265
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
am: 3a3d457968
...
Change-Id: Ie88c5885142eb9a232bd1448204c2111d9325d4f
2020-03-04 17:30:01 +00:00
Automerger Merge Worker
9cb57e5c3a
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
am: b08e748c54
...
Change-Id: Ifb3967b3fda51e59a1dbcf4a554a24cb560ca277
2020-03-04 17:30:00 +00:00
Automerger Merge Worker
b08e748c54
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
...
Change-Id: Ie5cbf24da1de6b5b0fcb7c101ee1b1b404f03118
2020-03-04 17:08:40 +00:00
Automerger Merge Worker
3a3d457968
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev am: 64d5b09500
...
Change-Id: I161853d92a352b7f0fa3eca408eb86a60a9905b6
2020-03-04 17:08:32 +00:00
Heemin Seog
64d5b09500
Merge "Replace TYPE_STATUS_BAR_PANEL with the SUB_PANEL" into rvc-dev
2020-03-04 17:06:51 +00:00
Automerger Merge Worker
7a315bda17
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4
am: d53f368e7e
...
Change-Id: I8df69f4c2edb4965d0e817808f6c4c517ddecd07
2020-03-04 12:50:00 +00:00
Automerger Merge Worker
7a04498c3f
Merge "Accessibility shortcut primary action - remove search and help icon" into rvc-dev am: 91d2dbe2d4
am: 9a8777e083
...
Change-Id: I5614de2f2c2cc0699924c549812c599621a09a88
2020-03-04 12:49:25 +00:00