Dmitry Dementyev
ea55e6331e
Add permission check to Intents used by Authenticator Settings.
...
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.
Bug: 33123882
Test: manual tests
Change-Id: I3ba9c768fc4f8093dcf2eadc17f14c506ec5c327
Merged-In: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-03-28 13:53:10 -07:00
Dmitry Dementyev
0fb3d55e3a
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486
...
am: d5f3ae5cac
2017-03-09 18:29:27 +00:00
Dmitry Dementyev
5330df501f
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20
...
am: c28fb3e071
2017-03-09 18:29:12 +00:00
Dmitry Dementyev
d5f3ae5cac
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151
...
am: efb9f74486
2017-03-09 18:25:27 +00:00
Dmitry Dementyev
c28fb3e071
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
...
am: 3b5b2d6d20
2017-03-09 18:25:11 +00:00
Dmitry Dementyev
efb9f74486
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863
...
am: 2569925151
2017-03-09 18:22:27 +00:00
Dmitry Dementyev
3b5b2d6d20
resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f
...
am: 8c5c5b5cec
2017-03-09 18:22:11 +00:00
Dmitry Dementyev
2569925151
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours
...
am: f1fb452863
2017-03-09 18:19:26 +00:00
Dmitry Dementyev
8c5c5b5cec
resolve merge conflicts of 3964c51bf2 to nyc-dev
...
am: 0f04a5a93f
2017-03-09 18:19:10 +00:00
Dmitry Dementyev
f1fb452863
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43
...
am: 3964c51bf2
2017-03-09 18:16:23 +00:00
Dmitry Dementyev
0f04a5a93f
resolve merge conflicts of 3964c51bf2 to nyc-dev
...
Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
2017-03-08 17:12:40 -08:00
Dmitry Dementyev
3964c51bf2
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217
...
am: def3eddb43
2017-03-08 19:17:42 +00:00
Dmitry Dementyev
def3eddb43
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9
...
am: b7e2545217
2017-03-08 19:15:40 +00:00
Dmitry Dementyev
b7e2545217
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258
...
am: 3a5e567ab9
2017-03-08 19:13:10 +00:00
Dmitry Dementyev
3a5e567ab9
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
...
am: 5c4276a258
2017-03-08 19:11:13 +00:00
Dmitry Dementyev
5c4276a258
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
am: e24780ed4c
2017-03-08 19:08:40 +00:00
Dmitry Dementyev
e24780ed4c
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
...
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
2017-03-07 19:52:02 -08:00
Bill Yi
55ba636186
Import translations. DO NOT MERGE
...
Change-Id: Ied9c4535fc4e6739099864f17584108b1d938c50
Auto-generated-cl: translation import
2017-02-22 08:50:31 -08:00
Dmitry Dementyev
75ae46d035
Add permission check to Intents used by Authenticator Settings.
...
Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.
Bug: 33123882
Test: manual tests
Change-Id: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6
2017-02-21 11:05:45 -08:00
Junda Liu
1bc3adf38a
Ignore orientation change to preserve ApnEditor. am: f414d58ddf
...
am: 77f75b3859
2017-02-17 18:07:06 +00:00
Junda Liu
77f75b3859
Ignore orientation change to preserve ApnEditor.
...
am: f414d58ddf
2017-02-17 18:02:35 +00:00
Bill Yi
6f3ae7778c
Import translations. DO NOT MERGE
...
Change-Id: Ie282481af5e8303bdbbdf8f0e91b70cfe433440e
Auto-generated-cl: translation import
2017-02-16 13:47:19 -08:00
Bill Yi
7e0985b644
Import translations. DO NOT MERGE
...
Change-Id: I9e1516012801af3f6f21231d6615f9a8969625ed
Auto-generated-cl: translation import
2017-02-16 05:24:28 -08:00
Philip P. Moltmann
9ac842a753
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."" into nyc-mr2-dev
2017-02-14 16:03:28 +00:00
Philip P. Moltmann
b92663afb1
[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."
...
This reverts commit 81758edffa
2017-02-13 23:44:55 +00:00
Bill Yi
da8a98fb26
Import translations. DO NOT MERGE
...
Change-Id: Ia85aa9d355617a44a438932f30332cfcbb70842a
Auto-generated-cl: translation import
2017-02-12 23:02:41 -08:00
Fan Zhang
fa190d437b
DO NOT MERGE Fix "3 dot" icon size so it displays fully
...
Viewport size was set wrong due to bad merge, causing the last dot got
truncated slightly.
Change-Id: I5d5bbd703e780b21957613d88a2250bc3ba69bb8
Fix: 28194068
Test: visual
2017-02-11 16:00:31 -08:00
Bill Yi
f9ef17c68e
Import translations. DO NOT MERGE
...
Change-Id: I48c8f3d9a4b34c83e0bc5737446c002584ef86a7
Auto-generated-cl: translation import
2017-02-08 18:55:40 -08:00
Junda Liu
f414d58ddf
Ignore orientation change to preserve ApnEditor.
...
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
(cherry picked from commit 76ad635ef7
2017-02-08 18:04:24 +00:00
Junda Liu
18fce0a7cf
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
2017-02-07 20:35:47 +00:00
TreeHugger Robot
b6c4241725
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-07 04:20:23 +00:00
Bill Yi
5d0af58793
Import translations. DO NOT MERGE
...
Change-Id: Iad621de4653a4ebbf3e3161a58ec8edb40e26022
Auto-generated-cl: translation import
2017-02-06 17:12:48 -08:00
Fan Zhang
de172c7727
Update "more" icon so the 3 dots are perfectly round.
...
Bug: 28194068
Test: visual
Change-Id: I23040c7fa638084fc653484e431039701c34bcb0
2017-02-06 20:40:22 +00:00
Junda Liu
76ad635ef7
Ignore orientation change to preserve ApnEditor.
...
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
2017-02-06 19:14:42 +00:00
Bill Yi
10246513d7
Import translations. DO NOT MERGE
...
Change-Id: Ia85a96f8c54e8cf487af5a395ab222b7fe25db15
Auto-generated-cl: translation import
2017-02-02 23:43:15 -08:00
TreeHugger Robot
47c8abaa67
Merge "[DO NOT MERGE] Use new QueuedWork interface." into nyc-mr2-dev
2017-02-01 23:08:54 +00:00
Christine Franks
22430d5abb
DO NOT MERGE - Require password to FR in carrier demo mode
...
Bug: 34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.
Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16
2017-02-01 09:37:28 -08:00
Christine Franks
bb6859ca75
DO NOT MERGE - Allow FR in carrier demo mode
...
Bug: 34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.
Change-Id: I373a2e94f205f6e6e4dd9a54dcf08532a64e5187
2017-02-01 00:37:45 +00:00
Bill Yi
2a3b062c4a
Import translations. DO NOT MERGE
...
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
2017-01-30 23:10:41 -08:00
Philip P. Moltmann
81758edffa
[DO NOT MERGE] Use new QueuedWork interface.
...
Test: Ran SharedPreferences CTS tests
Bug: 33385963
Bug: 30662828
Change-Id: I8025a087b43462324d0d45555094cbb54a671404
(cherry picked from commit 231c9fbfa6
2017-01-31 02:51:04 +00:00
TreeHugger Robot
d258b2f40f
Merge "Remove fake data" into nyc-mr2-dev
2017-01-27 20:31:40 +00:00
TreeHugger Robot
4edcb927ab
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
2017-01-27 19:59:03 +00:00
Salvador Martinez
a1499c3005
Remove fake data
...
Missed one location that adds fake data
to the payload the first time these were
removed. This patch removes any remaining
fake data being attached to a survey payload.
Test: Robotests still pass
Bug: 34716378
Change-Id: Iccb60ce24ae5c494dcd287107f8d293f4a56b2d5
Merged-In: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
2017-01-27 10:47:33 -08:00
Salvador Martinez
9db3cb3bee
Fix null pointer exception when surveys are turned off
...
In some conditions the survey provider could be null on
download completion which could lead to a NPE. This
has been addressed by not requiring an instance for
the removal of the receiver.
Test: RunSettingsRoboTests (master)
Bug: 33707203
Change-Id: Id1ab1a24c697fed8e4dd259682a088b50c35f38a
Merged-In: Icfb545697f24172db734dd7dad421796edf68186
2017-01-27 10:29:10 -08:00
TreeHugger Robot
f15b23ad65
Merge "Finalize string for usage alerts." into nyc-mr2-dev
2017-01-27 03:37:45 +00:00
Andrew Sapperstein
59fd24cde2
Finalize string for usage alerts.
...
Test: manual
Bug: 34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
2017-01-26 17:30:30 -08:00
Stefano Tommasini
a04697a951
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
2017-01-26 10:31:15 +00:00
TreeHugger Robot
063b543124
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-01-26 07:06:17 +00:00
Bill Yi
db68fc320f
Import translations. DO NOT MERGE
...
Change-Id: Ibb3ccac189513a5a988ec8c857f2ad574371808a
Auto-generated-cl: translation import
2017-01-25 20:04:52 -08:00
Jerry Zhang
361a3e2090
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
2017-01-25 20:30:18 +00:00
