Hyejin Kim
c46bbd6373
Add IMS settings to Network setting reset
...
am: 623852f6c7
2015-12-06 18:37:50 +00:00
Hyejin Kim
623852f6c7
Add IMS settings to Network setting reset
...
Add the factory reset function to be used to reset IMS settings
BUG=25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
2015-12-01 10:59:25 -08:00
Geoff Mendal
bdbd6da522
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours
...
am: 39be1461a8
2015-11-20 01:24:46 +00:00
Geoff Mendal
39be1461a8
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours
...
am: 74e9c3d348
2015-11-20 01:19:50 +00:00
Geoff Mendal
74e9c3d348
Import translations. DO NOT MERGE am: 2102350ea3 -s ours
...
am: 75dd183bf7
2015-11-20 01:14:23 +00:00
Geoff Mendal
75dd183bf7
Import translations. DO NOT MERGE
...
am: 2102350ea3
2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
2015-11-20 01:02:07 +00:00
Russell Brenner
ebc5086d15
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039
...
am: f0d538f08d
2015-11-17 20:32:03 +00:00
Russell Brenner
bcf3b75f57
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81
...
am: 8199c3028c
2015-11-17 20:31:54 +00:00
Russell Brenner
f0d538f08d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69
...
am: 2b29501039
2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93
...
am: 38e932dc81
2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e
...
am: 5950ff1d69
2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours
...
am: 439033dd93
2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
...
am: 8e4f6fbc2e
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1
...
am: 6967df6421
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
...
am: afe5eada5b
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
...
am: 97759fa8d1
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b
Merge "Block developer settings during SUW" into lmp-mr1-dev
...
am: 56d630a3ed
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
am: 14bf226c79
2015-11-17 19:51:09 +00:00
Russell Brenner
6a7ff3186b
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6
...
am: 7d44fe6fdb
2015-11-17 01:37:51 +00:00
Russell Brenner
7d44fe6fdb
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
...
am: 2075d98be6
2015-11-17 01:29:12 +00:00
Russell Brenner
2075d98be6
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
...
am: f0ff1631de
2015-11-17 01:22:41 +00:00
Sanket Padawe
60461f3410
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2
...
am: 773b8a3c44
2015-11-17 01:22:25 +00:00
Sanket Padawe
773b8a3c44
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4
...
am: 28eca8e8c2
2015-11-17 01:16:41 +00:00
Russell Brenner
f0ff1631de
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed
Merge "Block developer settings during SUW" into lmp-mr1-dev
2015-11-17 01:13:55 +00:00
Sanket Padawe
28eca8e8c2
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: 98f11fd1a4
2015-11-17 01:12:09 +00:00
Russell Brenner
14bf226c79
[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
2015-11-13 18:10:44 +00:00
Russell Brenner
de4fc8eb2a
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
2015-11-13 18:08:51 +00:00
Sanket Padawe
df5b8c5b65
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262
...
am: 0ad16831ee
2015-11-13 00:02:30 +00:00
Sanket Padawe
0ad16831ee
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: dbc47fb262
2015-11-12 23:57:48 +00:00
Sanket Padawe
98f11fd1a4
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 dbc47fb262
2015-11-12 23:54:06 +00:00
Sanket Padawe
dbc47fb262
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
2015-11-12 14:55:51 -08:00
Russell Brenner
4836ab6df4
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
2015-11-10 12:15:48 -08:00
Jason Monk
e198f7b84f
Null check queryIntentServices am: a4c9492b50
...
am: e27cada8c4
2015-11-09 22:36:21 +00:00
Jason Monk
e27cada8c4
Null check queryIntentServices
...
am: a4c9492b50
2015-11-09 22:31:51 +00:00
Jason Monk
a4c9492b50
Null check queryIntentServices
...
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
2015-11-09 16:56:46 -05:00
Dianne Hackborn
44643bad26
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d
...
am: a42bad972c#25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:24:34 +00:00
Dianne Hackborn
a42bad972c
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
...
am: 3b4e4dd91d#25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:20:13 +00:00
Dianne Hackborn
3b4e4dd91d
Merge "Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS" into mnc-dr-dev
2015-10-30 17:16:20 +00:00
Dianne Hackborn
b6c7b05056
Further tweak to issue #issue #25371736 : Don't include z-ram allocations in Android OS
...
Make sure the duration shown for z-ram is sane (the maximum of the
other process durations of that app).
Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
2015-10-29 17:32:28 -07:00
Dianne Hackborn
2af9128966
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076
...
am: 68954d930d#25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:43:04 +00:00
Dianne Hackborn
68954d930d
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
...
am: 508559d076#25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:39:39 +00:00
Dianne Hackborn
508559d076
Merge "Fix issue #25371736 : Don't include z-ram allocations in Android OS" into mnc-dr-dev
2015-10-29 23:36:14 +00:00
Dianne Hackborn
30bbd902dd
Fix issue #25371736 : Don't include z-ram allocations in Android OS
...
Just distribute them across all of the running apps, by creating
an additional fake "z-ram" process for each of them.
Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
2015-10-29 15:43:21 -07:00
Geoff Mendal
fe5582a26b
Import translations. DO NOT MERGE am: 260d90a102 -s ours
...
am: 04817defc9
2015-10-28 14:05:28 +00:00
Geoff Mendal
04817defc9
Import translations. DO NOT MERGE
...
am: 260d90a102
2015-10-28 14:00:31 +00:00
Geoff Mendal
260d90a102
Import translations. DO NOT MERGE
...
Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd
Auto-generated-cl: translation import
2015-10-28 08:55:41 -05:00
Geoff Mendal
436fcc47fc
Import translations. DO NOT MERGE am: c338bacb59 -s ours
...
am: 884a8bbe78
2015-10-26 14:17:02 +00:00
Geoff Mendal
884a8bbe78
Import translations. DO NOT MERGE
...
am: c338bacb59
2015-10-26 14:13:23 +00:00
