PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,902 Commits 1 Branch 0 Tags
4a2b5a89ec0eb0eca6d2a3fdc55a8bfbe36ecae2
Commit Graph

59902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
4a2b5a89ec Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: ef5570fd64 am: 6993251d18 
Change-Id: Ib8f57b07781c0becdbf05fb6ccfa9af2d3758634
 2020-03-05 17:29:09 +00:00
Automerger Merge Worker
856c7a4481 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: ece27868c4 am: 29a7e2f861 
Change-Id: I574ee0bed2909212bda69d01bdaf3df670464188
 2020-03-05 17:28:54 +00:00
Automerger Merge Worker
5487890d1c PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 am: ffe0b05d59 
Change-Id: Id3d8814143c5a1708ab0fdaacff70476f509c1d2
 2020-03-05 17:27:13 +00:00
Automerger Merge Worker
6993251d18 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 am: ef5570fd64 
Change-Id: I7006d0b41a188311cf9a395abd8ecce4d7e76864
 2020-03-05 17:17:23 +00:00
Automerger Merge Worker
29a7e2f861 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: ece27868c4 
Change-Id: Id49a9099fd2d86fe4b66bc8dddbdfe87758cda0c
 2020-03-05 17:16:48 +00:00
Automerger Merge Worker
ffe0b05d59 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 am: f82f82a582 
Change-Id: I2874831cdf21c3b0d51625bbf388b747af694a26
 2020-03-05 17:16:38 +00:00
Automerger Merge Worker
ef5570fd64 Merge "Use contrasted color icons" into rvc-dev am: 64fff70aa5 
Change-Id: I99c8ee2ce6a6cb2a33ba9566bc2429183e6ed44d
 2020-03-05 17:05:04 +00:00
Julia Reynolds
64fff70aa5 Merge "Use contrasted color icons" into rvc-dev 2020-03-05 17:02:15 +00:00
Automerger Merge Worker
ece27868c4 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 
Change-Id: Idaa3569dbc41841a59103fd77c6d56895d89a102
 2020-03-05 17:00:34 +00:00
Automerger Merge Worker
f82f82a582 PreferredNetworkModePreferenceController's summary no 5G item am: 8598dccce1 
Change-Id: I45745a9da40801e42dbaa2d3c1821e39fad33f4d
 2020-03-05 17:00:33 +00:00
SongFerngWang
8598dccce1 PreferredNetworkModePreferenceController's summary no 5G item 
Bug: 150839189
Test: Summary show 5G items
Change-Id: I5fa42e48b8c073b4c4933b32417c2cbeada09a40
 2020-03-05 14:08:53 +00:00
Automerger Merge Worker
4843d800ad String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 3e2a45b3b8 am: 3acae78c2a 
Change-Id: Ib9e371991a43731c0d2beae6905a1976f00ceb37
 2020-03-05 12:30:31 +00:00
Automerger Merge Worker
2051c18f49 String change on Storage page am: b7a3c9a8c6 am: b7fedbde23 am: a4bb9f3ea2 
Change-Id: I379dc1569b96de47afe3bd0327c2239ce4341638
 2020-03-05 12:12:44 +00:00
Automerger Merge Worker
ae768eeeb9 String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 5fcf5bae8d 
Change-Id: I2b5451b7d7ececf7fb4bc1acf87c1a95b0c2b810
 2020-03-05 12:12:39 +00:00
Automerger Merge Worker
3acae78c2a String change on Storage page am: b7a3c9a8c6 am: f3adfad699 am: 3e2a45b3b8 
Change-Id: Id4bf93919fe471a5b2455456d7b3292fe20cd79f
 2020-03-05 12:12:25 +00:00
Automerger Merge Worker
a4bb9f3ea2 String change on Storage page am: b7a3c9a8c6 am: b7fedbde23 
Change-Id: I8ab6e7f90c139f36ab378695fb5afc2e3f26d116
 2020-03-05 12:01:54 +00:00
Automerger Merge Worker
3e2a45b3b8 String change on Storage page am: b7a3c9a8c6 am: f3adfad699 
Change-Id: Ic88d76fa3cc34691b2b17f980291782ffe02fbbb
 2020-03-05 12:01:47 +00:00
Automerger Merge Worker
5fcf5bae8d String change on Storage page am: b7a3c9a8c6 am: f3adfad699 
Change-Id: I4903b1ae433e12d234a19552f6f0daa623798d5c
 2020-03-05 12:01:40 +00:00
Automerger Merge Worker
b7fedbde23 String change on Storage page am: b7a3c9a8c6 
Change-Id: Ib41098cad76e8f35cb96c1297a44286ec206683c
 2020-03-05 11:45:30 +00:00
Automerger Merge Worker
f3adfad699 String change on Storage page am: b7a3c9a8c6 
Change-Id: Iab4ceef706eb5f2ce9271d5cb188a70d89eeb3ef
 2020-03-05 11:45:21 +00:00
Automerger Merge Worker
e2265d1f52 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 am: 6d7acf94be am: 7aebe40613 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I607e223ce57c31d28718fb8d07b3428b17aa8af5
 2020-03-05 08:45:46 +00:00
Tsung-Mao Fang
b7a3c9a8c6 String change on Storage page 
The string of the CTA under "Settings > Storage" from "Free up space" to
"Manage storage" to match the new ux flow.

Test: visual
Fix: 150782402
Change-Id: Ic636d73b92f11f6f332475d591ff92633083bc85
 2020-03-05 08:45:03 +00:00
Automerger Merge Worker
e0ef60e5e5 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 087e60ca06 -s ours am: f225074bd0 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I637a8f6f00ee91d6305eefe6b57c782c45afc20c
 2020-03-05 08:31:53 +00:00
Automerger Merge Worker
1f9854d781 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 am: a8c2f1cb3c 
Change-Id: I2f334f1861a03094826a762a41f57670ad70423e
 2020-03-05 08:31:41 +00:00
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
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
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
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