OSDN Git Service
Dmitry Dementyev [Wed, 8 Mar 2017 19:11:13 +0000 (19:11 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c
am:
5c4276a258
Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
Dmitry Dementyev [Wed, 8 Mar 2017 19:08:40 +0000 (19:08 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev
am:
e24780ed4c
Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1
Dmitry Dementyev [Wed, 8 Mar 2017 03:47:52 +0000 (19:47 -0800)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev
Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug:
33123882
Test: manual tests:
Dmitry Dementyev [Tue, 14 Feb 2017 21:15:36 +0000 (13:15 -0800)]
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
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.
Bug:
31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
Pre-setup restrictions DO NOT MERGE
- Prevent external tiles from system apps
- Don't let user settings run
- Disable help
Bug:
29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
Geoff Mendal [Wed, 13 Jan 2016 00:44:04 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
Russell Brenner [Tue, 17 Nov 2015 20:05:54 +0000 (20:05 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b
am:
8e4f6fbc2e
* commit '
8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:05:43 +0000 (20:05 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1
am:
6967df6421 -s ours
* commit '
6967df642114a9c84d993cfd544d5a32f04c26b1':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 19:57:00 +0000 (19:57 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed
am:
afe5eada5b
* commit '
afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:56:48 +0000 (19:56 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79
am:
97759fa8d1
* commit '
97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 19:53:17 +0000 (19:53 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
am:
56d630a3ed
* commit '
56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:51:09 +0000 (19:51 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
am:
14bf226c79
* commit '
14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
Russell Brenner [Tue, 17 Nov 2015 01:13:55 +0000 (01:13 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
Bug:
25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
Preserve FRP lock if wiped during SUW
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug:
25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
Uncheck checkbox for contact sharing by default for non carkit devices.
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug:
23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit
dbc47fb262a4273417d99dabab757854aa3b0eaf)
Russell Brenner [Mon, 9 Nov 2015 19:35:42 +0000 (11:35 -0800)]
Block developer settings during SUW
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug:
25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]
am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 12:53:54 +0000 (12:53 +0000)]
am
8b6b589d: (-s ours) am
cec2a65a: (-s ours) am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:49:34 +0000 (12:49 +0000)]
am
cec2a65a: (-s ours) am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
cec2a65a98161c6c69e373647f03745c59246097':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:45:51 +0000 (12:45 +0000)]
am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
26bb544ff277020444b79543302b015160ead18a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:40:45 +0000 (12:40 +0000)]
am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:30:54 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 12:23:45 +0000 (12:23 +0000)]
am
974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit '
974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:17:15 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 13:11:42 +0000 (13:11 +0000)]
am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
1bd19dd17e2038df6c374ca6ed48498de4dde730':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:04:48 +0000 (13:04 +0000)]
am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:00:56 +0000 (13:00 +0000)]
am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:55:33 +0000 (12:55 +0000)]
am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:34:25 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 12:30:37 +0000 (12:30 +0000)]
am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
f598d0bcf70e27a14462bc5403c83822c5600945':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:21:40 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0eb630b2b5dec19d48787ff56367a3f05b41483a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Oct 2015 13:01:25 +0000 (13:01 +0000)]
am
ad36aa0e: (-s ours) am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
ad36aa0ed1b7ba2541d28bc447473e27f3d04e22':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:56:45 +0000 (12:56 +0000)]
am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
3963b980bebacb58dd2ed57fd45b042a01f125a0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:51:18 +0000 (12:51 +0000)]
am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
793b2a2d444192ee587a643c88e535ebf0c98158':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:46:38 +0000 (12:46 +0000)]
am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
d4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:41:35 +0000 (12:41 +0000)]
am
b4a027d0: (-s ours) Import translations. DO NOT MERGE
* commit '
b4a027d07bdd6b488a0ca576f7369beb0cad17c6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:36:18 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Oct 2015 12:23:13 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifeb18585f7add2909ad50d12839ba920a76cf44c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 12:55:55 +0000 (12:55 +0000)]
am
03226257: (-s ours) am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
032262578565c928b47996d096f3518cf1f09aa7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:52:33 +0000 (12:52 +0000)]
am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:45:22 +0000 (12:45 +0000)]
am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
0070fbfe01eab83402949298188322f1168b5b3c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:41:50 +0000 (12:41 +0000)]
am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
f0338376779311f2ee0c709e9735dfe5e89cde56':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:33:27 +0000 (05:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 12:32:07 +0000 (12:32 +0000)]
am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
010d2fcd2a4b8fda906ff0a0e04554475a45489c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:20:30 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)]
am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
dffcc532693c4bc6e07cf05ac532148612a94176':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:51:15 +0000 (12:51 +0000)]
am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)]
am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
49b491bb7634284a8622e48c88571aa59ba59ac7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:41:16 +0000 (12:41 +0000)]
am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
2e095fa263b0887fc55576b32625264e13fee4c7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:34:33 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 12:27:22 +0000 (12:27 +0000)]
am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:21:29 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cf12c7d6f311ec58e53d5b762c980641361541
Auto-generated-cl: translation import
Baligh Uddin [Sun, 27 Sep 2015 03:10:00 +0000 (03:10 +0000)]
am
4fdde2b5: (-s ours) am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
4fdde2b56fee192ea787a68d37fc4dc0ee0fab6e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:04:11 +0000 (03:04 +0000)]
am
2b802ceb: (-s ours) am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
2b802ceb328658fa18e007f859bda47a755dce30':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 03:03:44 +0000 (03:03 +0000)]
am
ec981982: (-s ours) am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
ec9819828df47813168d99fd2905b98a230a5d6f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:57:14 +0000 (02:57 +0000)]
am
cd6e6034: (-s ours) am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
cd6e60343a70ecf870f1ac3dcfa1e7981de8773d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:56:45 +0000 (02:56 +0000)]
am
9b9d77f1: (-s ours) am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
9b9d77f163b65057540b37ac4f6732f01f2b2e40':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:50:43 +0000 (02:50 +0000)]
am
15243a26: (-s ours) Import translations. DO NOT MERGE
* commit '
15243a260c8accf0a1fc999282a10d1ecec334b6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:49:56 +0000 (02:49 +0000)]
am
d0d54fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
d0d54fc1c54a046eaf919978d584fa3528c36e24':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:49:12 +0000 (02:49 +0000)]
am
ad7342ec: (-s ours) Import translations. DO NOT MERGE
* commit '
ad7342ec09fb5a6fb28e84d0d93603f8d40ff225':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 20:23:31 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:14:23 +0000 (13:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7678603b3f13a9cb9c95006d37c68689d6d9a509
Auto-generated-cl: translation import
Baligh Uddin [Fri, 25 Sep 2015 20:05:09 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d
Auto-generated-cl: translation import
Zach Jang [Mon, 21 Sep 2015 21:30:07 +0000 (21:30 +0000)]
am
7b2994d2: (-s ours) am
1304f47c: am
5cac8966: am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
7b2994d2e87eafe84425666aba8f818e661a6fac':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:30:06 +0000 (21:30 +0000)]
am
386c7763: (-s ours) am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
386c7763eb8cd3e856a26fe3cbd39cc573978c29':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:06:16 +0000 (21:06 +0000)]
am
1304f47c: am
5cac8966: am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
1304f47c1b63d1daa001f4d1c209a34f1b3af5d3':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:06:13 +0000 (21:06 +0000)]
am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
564ec9357bac62d571ba8ba9d58957477b8b5209':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 19:05:39 +0000 (19:05 +0000)]
am
5cac8966: am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
5cac896612ead73d08acb588e2f62512f8789cf4':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 19:05:36 +0000 (19:05 +0000)]
am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
00721b4afa3940138e82cd150bb6670239ec0b5b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 18:58:23 +0000 (18:58 +0000)]
am
8fc9b5b6: am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
8fc9b5b68494ac341b882623b1cbe124fd6256f8':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 18:58:12 +0000 (18:58 +0000)]
am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:40:30 +0000 (20:40 +0000)]
am
2e006b2b: am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
2e006b2b07c7c333c51fb9b447b8df6df66ba421':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:27:21 +0000 (20:27 +0000)]
am
b7e865ee: (-s ours) am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
b7e865ee486ea255e0f76c4d0129d608a7e7995d':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:16:45 +0000 (20:16 +0000)]
am
0431bc18: am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:04:24 +0000 (20:04 +0000)]
am
e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
e7e0c03f003930461603ae71ec0ce815d5a7f40a':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Thu, 17 Sep 2015 20:04:18 +0000 (20:04 +0000)]
am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 14 Sep 2015 21:03:12 +0000 (14:03 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3
b/
23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
Zach Jang [Sat, 12 Sep 2015 00:37:48 +0000 (17:37 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3
b/
23946860
Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
Baligh Uddin [Thu, 10 Sep 2015 21:53:10 +0000 (14:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e9b6d6564301a352d9034269dbd989b728555f5
Auto-generated-cl: translation import
Geoff Mendal [Fri, 28 Aug 2015 10:02:07 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23544168
Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
Sanket Padawe [Mon, 24 Aug 2015 17:52:51 +0000 (17:52 +0000)]
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
Sanket Padawe [Fri, 21 Aug 2015 23:45:30 +0000 (16:45 -0700)]
Avoid new network to connect by using "Add Network" instead only Save it.
Bug:
23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
Christopher Tate [Thu, 20 Aug 2015 23:38:37 +0000 (16:38 -0700)]
Present the security patch date in a human-friendly format
For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.
Bug
23358065
Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978
Selim Cinek [Thu, 20 Aug 2015 18:53:47 +0000 (11:53 -0700)]
Adapted string length translation limits
Bug:
23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
Julia Reynolds [Mon, 17 Aug 2015 17:14:38 +0000 (13:14 -0400)]
String update for battery details page.
Bug:
22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 16:46:03 +0000 (09:46 -0700)]
Only offer migration between private volumes.
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.
Bug:
22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
Adam Lesinski [Thu, 13 Aug 2015 23:56:30 +0000 (16:56 -0700)]
BatteryStats: Fix coalescing of shared app GIDs and system UIDs
UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.
Bug:
23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 23:57:46 +0000 (16:57 -0700)]
Show storage slow dialog allowing state loss.
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.
Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.
Bug:
22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
Christopher Tate [Thu, 13 Aug 2015 23:34:10 +0000 (16:34 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac