Commit Graph

9661 Commits

Author SHA1 Message Date
Steve Pfetsch
259b6a8029 Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev am: 76b29667df
am: 5ff50f2072

* commit '5ff50f2072880c76b6ad8486b5c35be9a39f9a29':
  Added toast message to color temperature setting
2016-01-22 22:29:47 +00:00
Kenny Root
bdc6074276 Merge "Stop using AlgNameMapper"
am: 8646736618

* commit '86467366183e7b7ca006456474cca50332213ca5':
  Stop using AlgNameMapper
2016-01-21 22:12:38 +00:00
Steve Pfetsch
8897655d2e 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
2016-01-21 10:44:51 -08:00
Kenny Root
1b291c13f4 Stop using AlgNameMapper
AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.

Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
2016-01-20 15:50:57 -08:00
Steve Pfetsch
dcd4a64f66 Enable color temperature developer setting am: ab5da2d2fe
am: 979a32e6e3

* commit '979a32e6e30d7fc12fb64ba842f66aee97cdac91':
  Enable color temperature developer setting
2016-01-15 20:44:42 +00:00
Steve Pfetsch
ab5da2d2fe Enable color temperature developer setting
Add a switch in Developer Settings to enable "cool" color temperature
mode.

Bug: 26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
2016-01-14 15:19:05 -08:00
Sungmin Choi
5a1e5edeb7 Select or not Wi-Fi Calling preference as CarrierConfig am: 577add865a
am: 6a4d214ed6

* commit '6a4d214ed6733efca5cb4217a64c4dd7b5a7e96d':
  Select or not Wi-Fi Calling preference as CarrierConfig
2016-01-11 20:33:11 +00:00
Sungmin Choi
577add865a 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
2016-01-11 11:06:41 -08:00
Mark Salyzyn
836be3ff89 Merge "whitelist "snet_event_log" when turning logs off"
am: 574814a4c2

* commit '574814a4c2ac0e66cd14eb6370dba426bb6d5882':
  whitelist "snet_event_log" when turning logs off
2016-01-08 22:44:12 +00:00
Mark Salyzyn
8fc90b4fe0 whitelist "snet_event_log" when turning logs off
- Before silencing the logs, ensure security logs are whitelisted
- Only touch persist.log.tag properties if they need to be, add
  stacking to the property.
- Clear persist.logd.size property when at default setting

Bug: 26178938
Change-Id: I8fdb040062dc9cbb23d7bc3c117d96ff8550c132
2016-01-08 13:48:24 -08:00
Alex Klyubin
ddbee086a6 Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
am: 3ba482971b

* commit '3ba482971b0f1709520ba9713fb11ac4727559c4':
  [2/3] Remove unnecessary throws statement in ServiceManager
2016-01-07 19:12:44 +00:00
Umair Khan
fee616c31a [2/3] Remove unnecessary throws statement in ServiceManager
Change-Id: Ifcda96d3ccb411ba23b40ee5cf222c25843d8a0e
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2016-01-07 15:16:28 +05:30
Mark Salyzyn
e938d6e6e7 Merge "Settings: switch to using ctl.start property instead of exec logcat"
am: 5987a26e78

* commit '5987a26e7862c7737acb1dcabbd6db1a795347b2':
  Settings: switch to using ctl.start property instead of exec logcat
2016-01-06 19:19:36 +00:00
Mark Salyzyn
8f3a25bf7d Settings: switch to using ctl.start property instead of exec logcat
- Moves policy of what to do with buffer size changes to logd

Bug: 23685592
Change-Id: Ib80a755213742dbf806a6f4423d5a709de2da645
2016-01-06 10:24:30 -08:00
Amith Yamasani
4ed2bb1ba9 Merge "Fix "division by zero" crash after USB mass storage disconnects"
am: a44b4feed4

* commit 'a44b4feed42d597224f9221396ef3ca1964ecc4b':
  Fix "division by zero" crash after USB mass storage disconnects
2016-01-05 00:31:12 +00:00
Amith Yamasani
a44b4feed4 Merge "Fix "division by zero" crash after USB mass storage disconnects" 2016-01-05 00:26:43 +00:00
Jason Monk
dfc6e32434 Merge "fix out of memory with continuous entry and exit InstalledAppDetail."
am: d298d474e6

* commit 'd298d474e620766b4308376525ef6a2730bbb299':
  fix out of memory with continuous entry and exit InstalledAppDetail.
2016-01-04 14:42:31 +00:00
daqiangx
2396a40c90 fix out of memory with continuous entry and exit InstalledAppDetail.
A session keeps in ApplicationsState list. The fragment don't release
the session when it is destroyed. The cause of out of memory is that the
session list is increased, but it can't be released.

Change-Id: I23635610c9fdfb8a3423299a91cf9b11cb5cdb65
Signed-off-by: daqiangx <daqiangx.li@intel.com>
2016-01-04 13:40:28 +08:00
Mark Salyzyn
94ab88228e resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
2015-12-28 10:49:04 -08:00
Mark Salyzyn
f3cc23524f Merge "Settings: Add option to disable logging" 2015-12-28 17:35:26 +00:00
Xinghan Yue
b997bd989e Fix "division by zero" crash after USB mass storage disconnects
File.java will return the total size in bytes of the partition
containing the path, and if the path does not exist,
it will return 0.

Change-Id: I134d4ec787b475e38bb37b4386bafcc419971c1e
2015-12-28 18:01:51 +01:00
Nick Kralevich
6556921a1e Merge "Hide usb mode chooser dialog after disconnected"
am: b913bf926e

* commit 'b913bf926e04280d0864cc36c759eddf88cf8b21':
  Hide usb mode chooser dialog after disconnected
2015-12-23 10:58:56 -08:00
Mark Salyzyn
285afa8d15 Settings: Add option to disable logging
Bug: 26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
2015-12-22 15:14:56 -08:00
Svetoslav
58d5d785ca DO NOT MERGE Modify system settings: incorrect UI state am: 119d589ea5
am: 6e88d0b02f

* commit '6e88d0b02f48d8b4c87f197ccca927373df99758':
  DO NOT MERGE Modify system settings: incorrect UI state
2015-12-22 11:44:00 -08:00
Svetoslav
119d589ea5 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 356fb2d10d)
2015-12-22 19:38:30 +00:00
Du, Changbin
93df36a1c7 Hide usb mode chooser dialog after disconnected
Add a UsbDisconnectedReceiver to listen usb state event, and hide
the usb mode chooser dialog if usb disconnected.

Change-Id: I871f56cb5a310e20950926180d9747dd9fad9754
Signed-off-by: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-12-22 15:26:13 +08:00
Hyejin Kim
00bc7567b8 Add IMS settings to Network setting reset am: 623852f6c7
am: c46bbd6373

* commit 'c46bbd637345e7dcfd637b1ba76896890e13bf5a':
  Add IMS settings to Network setting reset
2015-12-06 18:42:11 +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
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

* commit 'ebc5086d15bc1be602dfcd31925000e8c6184f16':
  Block developer settings during SUW
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

* commit '2b295010392c532a47e02e5b003459a50d6d5a62':
  Block developer settings during SUW
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

* commit '5950ff1d69ca27c09569f40862201ede261c831e':
  Block developer settings during SUW
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

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW
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

* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
  Block developer settings during SUW
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

* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW
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

* commit '6a7ff3186b6ad03a08801b8bb3fff5a30185eb4d':
  Preserve FRP lock if wiped during SUW
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

* commit '2075d98be6199032d0bdf65d9e1789153e12fb66':
  Preserve FRP lock if wiped during SUW
2015-11-17 01:29:12 +00:00
Russell Brenner
2075d98be6 Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
am: f0ff1631de

* commit 'f0ff1631dee1d988151f8260e6c65ff836a40e80':
  Preserve FRP lock if wiped during SUW
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

* commit '905829393d85db3e5d3f4b18a37c5da7184e6a63':
  VPN settings: grey out policy-restricted menus
2015-11-13 14:11:32 +00:00
Robin Lee
905829393d Merge "VPN settings: grey out policy-restricted menus"
am: ee4808d37b

* commit 'ee4808d37b955299501e9b753cc7bb19877d4f83':
  VPN settings: grey out policy-restricted menus
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

* commit 'df5b8c5b65050f08c36c1610d856282ab05fae5f':
  Uncheck checkbox for contact sharing by default for non carkit devices.
2015-11-13 00:07:06 +00:00
Sanket Padawe
0ad16831ee Uncheck checkbox for contact sharing by default for non carkit devices.
am: dbc47fb262

* commit 'dbc47fb262a4273417d99dabab757854aa3b0eaf':
  Uncheck checkbox for contact sharing by default for non carkit devices.
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