OSDN Git Service
Phil Weaver [Tue, 18 Jul 2017 20:47:53 +0000 (20:47 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9 am:
f6b1267780
am:
5d3967338d
Change-Id: Idcd6c6ab5a7cf0a594236a41a949031ed3e9855c
Phil Weaver [Tue, 18 Jul 2017 20:46:34 +0000 (20:46 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours am:
9d889600a9
am:
f6b1267780
Change-Id: I2e61b6da4262cf05ca30e2c2d505eb9cae017a9a
Phil Weaver [Tue, 18 Jul 2017 20:35:06 +0000 (20:35 +0000)]
Back-port ag/
2491664 am:
1d21738bd6 am:
4150739791 -s ours
am:
9d889600a9
Change-Id: Ia718620b0ec683d6b24cca6e56e9378a68d0ae3f
Phil Weaver [Tue, 18 Jul 2017 20:25:56 +0000 (20:25 +0000)]
Back-port ag/
2491664 am:
1d21738bd6
am:
4150739791 -s ours
Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b
Phil Weaver [Tue, 18 Jul 2017 18:26:16 +0000 (18:26 +0000)]
Back-port ag/
2491664
am:
1d21738bd6
Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Wed, 12 Jul 2017 22:35:43 +0000 (22:35 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours am:
bb12830bf9 am:
4a40ef7688
am:
a486c82d9c
Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0
Phil Weaver [Wed, 12 Jul 2017 22:29:09 +0000 (22:29 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours am:
bb12830bf9
am:
4a40ef7688
Change-Id: I6d627519091040c4d64841210003de8aa1471f53
Phil Weaver [Wed, 12 Jul 2017 22:23:16 +0000 (22:23 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4 am:
b72ffa47a4 -s ours
am:
bb12830bf9
Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f
Phil Weaver [Wed, 12 Jul 2017 22:19:08 +0000 (22:19 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours am:
df045253a4
am:
b72ffa47a4 -s ours
Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00
Phil Weaver [Wed, 12 Jul 2017 22:13:16 +0000 (22:13 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours am:
98e0930394 -s ours
am:
df045253a4
Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c
Phil Weaver [Wed, 12 Jul 2017 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e am:
bebc9f9f3c -s ours
am:
98e0930394 -s ours
Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb
Phil Weaver [Wed, 12 Jul 2017 21:59:38 +0000 (21:59 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38 am:
840b78e19e
am:
bebc9f9f3c -s ours
Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c
Phil Weaver [Wed, 12 Jul 2017 21:55:38 +0000 (21:55 +0000)]
DO NOT MERGE Back-port ag/
2491664 am:
9a14484b38
am:
840b78e19e
Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8
Phil Weaver [Wed, 12 Jul 2017 21:43:49 +0000 (21:43 +0000)]
DO NOT MERGE Back-port ag/
2491664
am:
9a14484b38
Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96
Phil Weaver [Tue, 11 Jul 2017 18:34:40 +0000 (11:34 -0700)]
DO NOT MERGE Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4
Phil Weaver [Fri, 12 May 2017 22:05:52 +0000 (22:05 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f am:
5d6d70a50e
am:
beb7f31d67
Change-Id: I13dc112b756569d68bddad1716db0e3979d0c150
Phil Weaver [Fri, 12 May 2017 22:02:53 +0000 (22:02 +0000)]
Don't enable a11y service if scary dialog obscured am:
9a1b4eb21f
am:
5d6d70a50e
Change-Id: Ib4fca899498f1348263beff3908c24a9ec65c392
Phil Weaver [Fri, 12 May 2017 22:00:23 +0000 (22:00 +0000)]
Don't enable a11y service if scary dialog obscured
am:
9a1b4eb21f
Change-Id: I0a288cb9cef29d730ec82028cf0dc003970db734
Phil Weaver [Tue, 9 May 2017 17:51:32 +0000 (10:51 -0700)]
Don't enable a11y service if scary dialog obscured
Bug:
38134845
Test: Trivial back-port of ag/
2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440
Dmitry Dementyev [Wed, 12 Apr 2017 20:00:05 +0000 (20:00 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours am:
56dc835f3c -s ours
am:
b23bdee761 -s ours
Change-Id: Ie66bdaba9900b112cee1d9503a332b7bbe203283
Dmitry Dementyev [Wed, 12 Apr 2017 19:54:06 +0000 (19:54 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours am:
5f32a5b5f3 -s ours
am:
56dc835f3c -s ours
Change-Id: Iafcd0d4116683e0b40a9f98ef9ccf3d176ec0b32
Dmitry Dementyev [Wed, 12 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours am:
2d9593f8f1 -s ours
am:
5f32a5b5f3 -s ours
Change-Id: I608a98d05d77b2e755f516ec60c64484c81437da
Dmitry Dementyev [Wed, 12 Apr 2017 19:44:05 +0000 (19:44 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours am:
13b12fd61d -s ours
am:
2d9593f8f1 -s ours
Change-Id: Id5ccadb538d8986e86b614d9303a637d6661c482
Dmitry Dementyev [Wed, 12 Apr 2017 19:37:33 +0000 (19:37 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours am:
22db6274bf -s ours
am:
13b12fd61d -s ours
Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5
Dmitry Dementyev [Wed, 12 Apr 2017 19:32:36 +0000 (19:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a am:
0c07b38054 -s ours
am:
22db6274bf -s ours
Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855
Dmitry Dementyev [Wed, 12 Apr 2017 19:26:32 +0000 (19:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e am:
bac5163a9a
am:
0c07b38054 -s ours
Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am:
ea55e6331e
am:
bac5163a9a
Change-Id: Ib70241c596aca047a096318eb2026634692f8620
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am:
ea55e6331e
Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232
Dmitry Dementyev [Wed, 15 Mar 2017 19:33:05 +0000 (12:33 -0700)]
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
Dmitry Dementyev [Wed, 8 Mar 2017 19:17:42 +0000 (19:17 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c am:
5c4276a258 am:
3a5e567ab9 am:
b7e2545217
am:
def3eddb43
Change-Id: I103086932e0f5071b1fa554a9e11a524b0d36d7d
Dmitry Dementyev [Wed, 8 Mar 2017 19:15:40 +0000 (19:15 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c am:
5c4276a258 am:
3a5e567ab9
am:
b7e2545217
Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29
Dmitry Dementyev [Wed, 8 Mar 2017 19:13:10 +0000 (19:13 +0000)]
resolve merge conflicts of
75ae46d035 to lmp-mr1-dev am:
e24780ed4c am:
5c4276a258
am:
3a5e567ab9
Change-Id: Ie14fd1ef35f12fffadf4e241e3cd8146a1063d8a
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 [Tue, 6 Sep 2016 23:14:25 +0000 (23:14 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af am:
d278da7952
am:
94a0fa5759
Change-Id: I76460eee64ad7bc84d67379dc4f952deb2232130
Maurice Lam [Tue, 6 Sep 2016 23:11:17 +0000 (23:11 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE am:
c94f2b93af
am:
d278da7952
Change-Id: I771b15c4c94314f7fb3f1d3d3734b0c97a35f782
Maurice Lam [Tue, 6 Sep 2016 23:08:45 +0000 (23:08 +0000)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
am:
c94f2b93af
Change-Id: Ib66b9b9d6b97fe1299a24b0c92991b4bd6a46656
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 [Fri, 15 Jul 2016 14:05:59 +0000 (14:05 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf
am:
68d53c0481
Change-Id: Ic501eb9b08f18eb3e9f3e95d64aae511815db268
Jason Monk [Fri, 15 Jul 2016 14:03:03 +0000 (14:03 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b
am:
2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
Jason Monk [Fri, 15 Jul 2016 13:59:59 +0000 (13:59 +0000)]
Pre-setup restrictions DO NOT MERGE
am:
e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
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, 17 Feb 2016 15:15:28 +0000 (07:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8c51d320dee803b9c72bb5e0737ca44beb40819e
Auto-generated-cl: translation import
Geoff Mendal [Mon, 15 Feb 2016 15:15:03 +0000 (07:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib0959f6786971b40e95c4fa0a23d7bf893ecd5fb
Auto-generated-cl: translation import
Svetoslav [Sun, 14 Feb 2016 22:38:52 +0000 (22:38 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state am:
2c02228ad0
am:
5527ac9cf2
* commit '
5527ac9cf215fb894153bae8c3bb06fb5264d146':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Sun, 14 Feb 2016 22:28:25 +0000 (22:28 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state
am:
2c02228ad0
* commit '
2c02228ad0cd7b9d86050647c679843e829819d4':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
DO NOT MERGE Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:
25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
(cherry picked from commit
119d589ea5aa9c2ccc5164279d718a20d0865f20)
Geoff Mendal [Wed, 10 Feb 2016 15:23:28 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c4a21fdb89a240803d39cc929c34ea89686ff4f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 3 Feb 2016 15:34:47 +0000 (07:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3d3c5d3b41843dab533b33325e67de3de8a88440
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 16:28:24 +0000 (08:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5571d71b847f91111ebc937a387fc97a26546791
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Feb 2016 15:24:56 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie7dce1455e8b29196b023509228f876c105f5705
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Jan 2016 15:25:34 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I11b283943bfe2746792e6a9ec3c3ca5f3f000832
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Jan 2016 15:24:17 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24a034300aade7c9b389c92a29433347cac07070
Auto-generated-cl: translation import
Steve Pfetsch [Fri, 22 Jan 2016 22:07:54 +0000 (22:07 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
Steve Pfetsch [Thu, 21 Jan 2016 01:48:13 +0000 (17:48 -0800)]
Added toast message to color temperature setting
Added a toast message to inform the user that the color temperature
setting is applied once the display is off.
Bug:
26110238
Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
Geoff Mendal [Wed, 20 Jan 2016 15:31:39 +0000 (07:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie620b53b05ebf701b1279275da7c4090c14ed446
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 15:32:09 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692
Auto-generated-cl: translation import
Steve Pfetsch [Thu, 14 Jan 2016 01:07:35 +0000 (17:07 -0800)]
Enable color temperature developer setting
Add a switch in Developer Settings to enable "cool" color temperature
mode.
Bug:
26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
Justin Harrison [Thu, 14 Jan 2016 01:56:42 +0000 (01:56 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
Steve Pfetsch [Wed, 13 Jan 2016 23:22:56 +0000 (15:22 -0800)]
Add strings for color temperature developer option
Introducing en-US strings for color temperature settings ahead of code
changes.
Bug:
26110238
Change-Id: I5a12aa35a730d93daa6383f7dde7d3c90db1d74b
Geoff Mendal [Wed, 13 Jan 2016 01:10:08 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours am:
21e3d54adc -s ours
am:
b994c93600 -s ours
* commit '
b994c936002bacf9d6fe314f9ebef3432a58dd6c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:07:32 +0000 (01:07 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours
am:
21e3d54adc -s ours
* commit '
21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:05:38 +0000 (01:05 +0000)]
Import translations. DO NOT MERGE
am:
6a52aca8ea -s ours
* commit '
6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
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
Sungmin Choi [Wed, 23 Dec 2015 05:24:52 +0000 (14:24 +0900)]
Select or not Wi-Fi Calling preference as CarrierConfig
Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.
Bug:
26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
DO NOT MERGE Modify system settings: incorrect UI state
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:
25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
Geoff Mendal [Sat, 12 Dec 2015 01:58:32 +0000 (17:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
Geoff Mendal [Sat, 12 Dec 2015 01:42:00 +0000 (01:42 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
df57be8aef6dd1760e72d7f76490048eeb425a3e.
Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
Geoff Mendal [Sat, 12 Dec 2015 00:05:26 +0000 (16:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
Hyejin Kim [Thu, 5 Nov 2015 03:35:39 +0000 (12:35 +0900)]
Add IMS settings to Network setting reset
Add the factory reset function to be used to reset IMS settings
BUG=
25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
Geoff Mendal [Fri, 20 Nov 2015 01:19:50 +0000 (01:19 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours
am:
74e9c3d348 -s ours
* commit '
74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:14:23 +0000 (01:14 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours
am:
75dd183bf7 -s ours
* commit '
75dd183bf7b99c995fe773e7b53a6604a6b53512':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:09:14 +0000 (01:09 +0000)]
Import translations. DO NOT MERGE
am:
2102350ea3 -s ours
* commit '
2102350ea33d8bbed50d9447889876fa295b3e8a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 00:58:46 +0000 (16:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
Russell Brenner [Tue, 17 Nov 2015 20:32:03 +0000 (20:32 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e am:
5950ff1d69 am:
2b29501039
am:
f0d538f08d
* commit '
f0d538f08da7c45e545e51e93373afe38cbd518f':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:31:54 +0000 (20:31 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93 am:
38e932dc81
am:
8199c3028c
* commit '
8199c3028c05cd9c85b6f26fe656518f536bda69':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:23:22 +0000 (20:23 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e am:
5950ff1d69
am:
2b29501039
* commit '
2b295010392c532a47e02e5b003459a50d6d5a62':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:23:06 +0000 (20:23 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93
am:
38e932dc81
* commit '
38e932dc816fe7aff6443bfa5648743f527aa097':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:14:22 +0000 (20:14 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e
am:
5950ff1d69
* commit '
5950ff1d69ca27c09569f40862201ede261c831e':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:14:10 +0000 (20:14 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours
am:
439033dd93
* commit '
439033dd93417b98acff392865166503a507ff30':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
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:37:51 +0000 (01:37 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am:
f0ff1631de am:
2075d98be6
am:
7d44fe6fdb
* commit '
7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:29:12 +0000 (01:29 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am:
f0ff1631de
am:
2075d98be6
* commit '
2075d98be6199032d0bdf65d9e1789153e12fb66':
Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:22:41 +0000 (01:22 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
am:
f0ff1631de
* commit '
f0ff1631dee1d988151f8260e6c65ff836a40e80':
Preserve FRP lock if wiped during SUW
Sanket Padawe [Tue, 17 Nov 2015 01:22:25 +0000 (01:22 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4 am:
28eca8e8c2
am:
773b8a3c44
* commit '
773b8a3c4422ab9daf7adb62895568852b43882e':
Uncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Tue, 17 Nov 2015 01:16:41 +0000 (01:16 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4
am:
28eca8e8c2
* commit '
28eca8e8c2d9e11a9f304e85ff3a34819edd68a9':
Uncheck checkbox for contact sharing by default for non carkit devices.
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
Sanket Padawe [Tue, 17 Nov 2015 01:12:09 +0000 (01:12 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices.
am:
98f11fd1a4
* commit '
98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3':
Uncheck checkbox for contact sharing by default for non carkit devices.
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 [Fri, 13 Nov 2015 00:02:30 +0000 (00:02 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
dbc47fb262
am:
0ad16831ee
* commit '
0ad16831ee2e2029a0fc2891c8007505bb9779cd':
Uncheck checkbox for contact sharing by default for non carkit devices.
OSDN Git Service
