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
Geoff Mendal
c338bacb59
Import translations. DO NOT MERGE
...
Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f
Auto-generated-cl: translation import
2015-10-26 07:03:05 -07:00
Jason Monk
eccc9b3962
Fix crash in Settings from uninstall am: 6e2e8e17cf
...
am: 34d6ea560d
2015-10-22 23:37:48 +00:00
Jason Monk
34d6ea560d
Fix crash in Settings from uninstall
...
am: 6e2e8e17cf
2015-10-22 23:12:02 +00:00
Jason Monk
6e2e8e17cf
Fix crash in Settings from uninstall
...
Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
2015-10-22 22:58:50 +00:00
Geoff Mendal
79e81bca9c
Import translations. DO NOT MERGE am: a489856def -s ours
...
am: f3ad526200
2015-10-21 14:59:01 +00:00
Geoff Mendal
f3ad526200
Import translations. DO NOT MERGE
...
am: a489856def
2015-10-21 14:48:15 +00:00
Geoff Mendal
a489856def
Import translations. DO NOT MERGE
...
Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import
2015-10-21 07:05:23 -07:00
Jason Monk
47db2ba628
Allow access to permissions, even if app has none am: 36866c8e84
...
am: 6fde534148
2015-10-21 01:46:11 +00:00
Jason Monk
6fde534148
Allow access to permissions, even if app has none
...
am: 36866c8e84
2015-10-21 01:43:06 +00:00
Jason Monk
36866c8e84
Allow access to permissions, even if app has none
...
Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
2015-10-20 19:38:58 -04:00
Michael Wright
98ec49dd6c
Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
2015-10-20 17:54:53 +00:00
Michael Wright
94a5587ed6
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c
...
am: 6e957d6b42
2015-10-20 17:54:46 +00:00
Michael Wright
ad1f744417
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c
...
am: 6e957d6b42
2015-10-20 17:54:29 +00:00
Jeff Sharkey
0b07ce50a7
Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6
...
am: 82839c8073
2015-10-20 17:49:25 +00:00
Jeff Sharkey
10338550c4
Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf
...
am: a8bd650e81
2015-10-20 17:48:14 +00:00
Michael Wright
6e957d6b42
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
...
am: 66b6591d4c
2015-10-20 17:35:19 +00:00
Jeff Sharkey
82839c8073
Merge "Hide empty data usage cycles." into mnc-dr-dev
...
am: 2fcbdb7bb6
2015-10-20 17:33:50 +00:00
Jeff Sharkey
a8bd650e81
Merge "Clamp large data usage values." into mnc-dr-dev
...
am: 29b0ea2dbf
2015-10-20 17:32:47 +00:00
Michael Wright
66b6591d4c
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
2015-10-20 17:23:40 +00:00
Jeff Sharkey
2fcbdb7bb6
Merge "Hide empty data usage cycles." into mnc-dr-dev
2015-10-20 17:21:52 +00:00
Jeff Sharkey
29b0ea2dbf
Merge "Clamp large data usage values." into mnc-dr-dev
2015-10-20 17:21:43 +00:00
