Hyejin Kim
24233d439e
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-09 20:47:53 -08:00
Sanket Padawe
71cf9d1d12
Make phone number in Sim Settings read properly in Talk back mode.
...
Bug: 24308980
Change-Id: I384ec4ed8863cf6bdfa6e84ed2d88d9eda4ff42e
2015-12-09 20:44:06 -08:00
Russell Brenner
549379737d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d
...
am: ebc5086d15
2015-11-17 20:40:50 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jason Monk
652ba5e22e
Fix crash in Settings from uninstall am: 6e2e8e17cf am: 34d6ea560d
...
am: eccc9b3962
2015-10-22 23:42:14 +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
Jason Monk
4f9f28effb
Allow access to permissions, even if app has none am: 36866c8e84 am: 6fde534148
...
am: 47db2ba628
2015-10-21 02:20:21 +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
e794a5814c
Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c am: 6e957d6b42
...
am: 94a5587ed6
2015-10-20 18:34:11 +00:00
Jeff Sharkey
2197d960a9
Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073
...
am: 0b07ce50a7
2015-10-20 18:32:34 +00:00
Jeff Sharkey
071352de9e
Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf am: a8bd650e81
...
am: 10338550c4
2015-10-20 18:30:09 +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
