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
7285e2c2fc
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 am: 7d44fe6fdb
...
am: 6a7ff3186b
2015-11-17 01:47:46 +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
Sanket Padawe
5df69b5307
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2 am: 773b8a3c44
...
am: 60461f3410
2015-11-17 01:28:09 +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
Robin Lee
3ed65b90d0
Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b
...
am: 905829393d
2015-11-13 14:11:32 +00:00
Robin Lee
905829393d
Merge "VPN settings: grey out policy-restricted menus"
...
am: ee4808d37b
2015-11-13 14:08:52 +00:00
Robin Lee
ee4808d37b
Merge "VPN settings: grey out policy-restricted menus"
2015-11-13 14:07:05 +00:00
Robin Lee
4198607ee2
VPN settings: grey out policy-restricted menus
...
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.
Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
2015-11-13 14:01:43 +00:00
Sanket Padawe
f20ba4b797
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 am: 0ad16831ee
...
am: df5b8c5b65
2015-11-13 00:07:06 +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
7ee05202ab
Null check queryIntentServices am: a4c9492b50 am: e27cada8c4
...
am: e198f7b84f
2015-11-09 22:40:33 +00: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
Baligh Uddin
4b87b724eb
Import translations. DO NOT MERGE
...
am: 7b9f79bb6e
2015-11-05 19:40:21 +00:00
Baligh Uddin
7b9f79bb6e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25433205
Change-Id: I38ff46207ad622dc25f4cbbf6445ceac1dcfedb7
2015-11-04 12:11:39 -08:00
Jason Monk
1150cfce95
Merge "Don\'t show MIDI USB option if not supported" am: c2a9cd03f7
...
am: 92aafd3ed5
2015-11-04 15:02:47 +00:00
Jason Monk
92aafd3ed5
Merge "Don\'t show MIDI USB option if not supported"
...
am: c2a9cd03f7
2015-11-04 14:56:04 +00:00
Jason Monk
c2a9cd03f7
Merge "Don't show MIDI USB option if not supported"
2015-11-04 14:43:11 +00:00
Zoran Jovanovic
81ec094554
Don't show MIDI USB option if not supported
...
If device doesn't support MIDI, don't show MIDI in "Use USB for" menu
when USB cable is connected.
(Selecting MIDI will crash the Settings app.)
Change-Id: I60f4cbb6357f162fecb574cdb6766cf5ed92e78e
2015-11-04 15:21:58 +01:00
Dianne Hackborn
c271a8a00e
Merge "Further tweak to issue #issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 3b4e4dd91d am: a42bad972c
...
am: 44643bad26#25371736 : Don't include z-ram allocations in Android OS
2015-10-30 17:27:44 +00: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
6ee79b2823
Merge "Fix issue #25371736 : Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076 am: 68954d930d
...
am: 2af9128966#25371736 : Don't include z-ram allocations in Android OS
2015-10-29 23:46:20 +00: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
