Automerger Merge Worker
7aebe40613
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 306f776fc3
am: 6d7acf94be
...
Change-Id: I1cebbe943e2f7354e666430d9d700087568020af
2020-03-05 08:31:31 +00:00
Automerger Merge Worker
f225074bd0
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 087e60ca06
-s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: I728e0d06a0f9e64814509f39b319c20b34df93b7
2020-03-05 08:18:22 +00:00
Automerger Merge Worker
6d7acf94be
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 306f776fc3
...
Change-Id: Ia3a4a25e72c2884b1ca177d9a13a6325a0d409e8
2020-03-05 08:18:16 +00:00
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
df5b511a02
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
am: 38e71ec3f0
am: 7a14d9cdcf
am: 9ce48f1db8
...
Change-Id: I58564d57442103b47bbfb28a450f14d994b0dca1
2020-03-05 06:53:23 +00:00
Automerger Merge Worker
031f2fe4d5
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 15d36aeddc
am: 9fe8ed6ec5
am: 0e1d76de68
...
Change-Id: Iddb03f512e63ca44a0f1c491e02c31c81b23cd46
2020-03-05 06:52:45 +00:00
Automerger Merge Worker
f3bd08e143
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
am: fcf2bfd780
am: 12c9710488
...
Change-Id: Ia53ec03c367d07f2e77f35553c7a68559e0b2f80
2020-03-05 06:52:07 +00:00
Automerger Merge Worker
9ce48f1db8
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
am: 38e71ec3f0
am: 7a14d9cdcf
...
Change-Id: Ia747249ab06b1c994b638a9eadef2e18367d68de
2020-03-05 06:50:46 +00:00
Automerger Merge Worker
0e1d76de68
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 15d36aeddc
am: 9fe8ed6ec5
...
Change-Id: I29370f4ae2033c70b17c0c0470de0e4eca214ef5
2020-03-05 06:31:35 +00:00
Automerger Merge Worker
12c9710488
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
am: fcf2bfd780
...
Change-Id: If53c5dedef3c036ad2a8fb3148b03118e927ee39
2020-03-05 06:30:52 +00:00
Automerger Merge Worker
7a14d9cdcf
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
am: 38e71ec3f0
...
Change-Id: Ib5ee773a9e8542e0ffc6497fa9943ca362824d20
2020-03-05 06:30:42 +00:00
Automerger Merge Worker
38e71ec3f0
Merge "Add package name when launching output switcher from remote slice" into rvc-dev am: 5578920e4c
am: 3cd1238aff
...
Change-Id: Ib0182de84f512c9d83e3f2e709a7af1d108b78ce
2020-03-05 06:13:00 +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
a3de28b589
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
am: c2221502c5
am: 35e739759e
am: f5e48a0609
...
Change-Id: I6ff73a63dcd653982bb6be8dea6b1252c83c732e
2020-03-05 04:19:03 +00:00
Automerger Merge Worker
a55600ef34
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
am: 93bab2ba1f
am: 9ef9149bf0
am: 9a66efac2e
...
Change-Id: I1b9a408a405ee0194a90219d25c85a6721e4ceb4
2020-03-05 04:18:52 +00:00
Automerger Merge Worker
6e1394ef03
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 4a4ee98a19
am: 74b81bd431
am: 7250751667
...
Change-Id: I6fbfdefe7640336bef974af5eba8c2004eb81e70
2020-03-05 04:18:41 +00:00
Automerger Merge Worker
33ec87df35
Merge "Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: 35014d26ed" into rvc-d1-dev-plus-aosp am: d1cf39086a
am: 756760ca17
...
Change-Id: I44dcb604255d6faac752799e967500983b82c269
2020-03-05 04:18:18 +00:00
Automerger Merge Worker
5fb4472733
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
am: 1e3e1fe4f4
am: a6135ebcea
...
Change-Id: Icdba97d98993b7210d0d45e465a5889dbbb60400
2020-03-05 04:17:23 +00:00
Automerger Merge Worker
eb4e47a4ee
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
am: 2a989e2f83
am: 28c28ca028
...
Change-Id: Ieca23d349003eff5719833d211121170a3b5e166
2020-03-05 04:12:19 +00:00
Automerger Merge Worker
f5e48a0609
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
am: c2221502c5
am: 35e739759e
...
Change-Id: I31f6bea99087fe350486af690fe77c33f37efd34
2020-03-05 04:02:05 +00:00
Automerger Merge Worker
9a66efac2e
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
am: 93bab2ba1f
am: 9ef9149bf0
...
Change-Id: I315c0b538608a505a5dd68f316220b10c54c35f9
2020-03-05 04:01:53 +00:00
Automerger Merge Worker
7250751667
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 4a4ee98a19
am: 74b81bd431
...
Change-Id: Ia069f8d78065c7755913eee2c74e159675351176
2020-03-05 03:54:31 +00:00
Automerger Merge Worker
756760ca17
Merge "Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: 35014d26ed" into rvc-d1-dev-plus-aosp am: d1cf39086a
...
Change-Id: Ice7b807e962f5cc1ca069c7a5a07b463f9290dc2
2020-03-05 03:54:22 +00:00
Automerger Merge Worker
a6135ebcea
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
am: 1e3e1fe4f4
...
Change-Id: Ifdb07d51a191f0dbfa12bb0e06c12807f9b95f9a
2020-03-05 03:53:34 +00:00
Automerger Merge Worker
28c28ca028
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
am: 2a989e2f83
...
Change-Id: I49c145cb70a84e76b112c4739b77b652fd8c2804
2020-03-05 03:51:00 +00:00
Automerger Merge Worker
35e739759e
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
am: c2221502c5
...
Change-Id: Id87e896798a71ce18a77a2731b797728c9678dcd
2020-03-05 03:50:35 +00:00
Automerger Merge Worker
9ef9149bf0
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
am: 93bab2ba1f
...
Change-Id: I42cb6b3ef2a18e70cdd9bf52fb89908384be33cc
2020-03-05 03:48: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
TreeHugger Robot
a83b5852b8
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked"
2020-03-05 03:29:42 +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
c2221502c5
Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
am: 60bc99d812
...
Change-Id: Ibae1496eefbb951c0620d8e45c5e639637ee0b2a
2020-03-05 03:28:38 +00:00
Automerger Merge Worker
93bab2ba1f
Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev am: d9f611fe6b
am: ccfe8c6624
...
Change-Id: I3b60652b4ed13e5f56b0e72fde87e5bdc3102399
2020-03-05 03:28:21 +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