OSDN Git Service
Geoff Mendal [Mon, 25 Jan 2016 15:36:19 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
df9f6fc49d -s ours
* commit '
df9f6fc49d769835179343a2217cb9fc750d4942':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:34:18 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 25 Jan 2016 15:32:50 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iee1094b5b742ed2523dd83c8a362f3b889e035f6
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Jan 2016 15:32:29 +0000 (15:32 +0000)]
Import translations. DO NOT MERGE am:
13391af4fc -s ours
am:
6142ec45b9 -s ours
* commit '
6142ec45b92457e4119af1408a68bc92117935e8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:30:39 +0000 (15:30 +0000)]
Import translations. DO NOT MERGE
am:
13391af4fc -s ours
* commit '
13391af4fc4d095d2c94b388e441e34645ef7f68':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 15:24:17 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24a034300aade7c9b389c92a29433347cac07070
Auto-generated-cl: translation import
Steve Pfetsch [Fri, 22 Jan 2016 22:29:47 +0000 (22:29 +0000)]
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
Steve Pfetsch [Fri, 22 Jan 2016 22:21:34 +0000 (22:21 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
am:
76b29667df
* commit '
76b29667dff7b27151e450a05838913971f93c8f':
Added toast message to color temperature setting
Steve Pfetsch [Fri, 22 Jan 2016 22:07:54 +0000 (22:07 +0000)]
Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev
Kenny Root [Thu, 21 Jan 2016 22:12:38 +0000 (22:12 +0000)]
Merge "Stop using AlgNameMapper"
am:
8646736618
* commit '
86467366183e7b7ca006456474cca50332213ca5':
Stop using AlgNameMapper
Kenny Root [Thu, 21 Jan 2016 21:53:11 +0000 (21:53 +0000)]
Merge "Stop using AlgNameMapper"
Steve Pfetsch [Thu, 21 Jan 2016 01:48:13 +0000 (17:48 -0800)]
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
Kenny Root [Wed, 20 Jan 2016 23:50:55 +0000 (15:50 -0800)]
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
Geoff Mendal [Wed, 20 Jan 2016 17:52:58 +0000 (17:52 +0000)]
Import translations. DO NOT MERGE am:
ffb0eb03a7 -s ours
am:
97898c5cd2 -s ours
* commit '
97898c5cd2033c331b537d9b17205e09d991e56d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:43:14 +0000 (17:43 +0000)]
Import translations. DO NOT MERGE
am:
bcefb0397f -s ours
* commit '
bcefb0397f06f52a50e994418ae590581e217428':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:41:58 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE
am:
ffb0eb03a7 -s ours
* commit '
ffb0eb03a729758c6477a701c07f39121ee95872':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 15:40:11 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfc8542b0e1f51163d9ff7f5327e851a08377d67
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 15:31:39 +0000 (07:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie620b53b05ebf701b1279275da7c4090c14ed446
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 15:44:11 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE am:
c123a6a923 -s ours
am:
550dd6e8dc -s ours
* commit '
550dd6e8dceaaf2fbb2ed7a24e221c24cd72ee7d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:44:00 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE
am:
bd620a7de1 -s ours
* commit '
bd620a7de1b171ac54ce1268e12d1757c0baa86d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:41:49 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
c123a6a923 -s ours
* commit '
c123a6a9230faf4800df67085b98bcd7badf4ca8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:40:39 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91bced80bb025ac6d6599db0a48f2332cea70520
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 15:32:09 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692
Auto-generated-cl: translation import
Steve Pfetsch [Fri, 15 Jan 2016 20:44:42 +0000 (20:44 +0000)]
Enable color temperature developer setting am:
ab5da2d2fe
am:
979a32e6e3
* commit '
979a32e6e30d7fc12fb64ba842f66aee97cdac91':
Enable color temperature developer setting
Steve Pfetsch [Fri, 15 Jan 2016 20:42:18 +0000 (20:42 +0000)]
Enable color temperature developer setting
am:
ab5da2d2fe
* commit '
ab5da2d2fe0b02a7cdf5f4d78d24583b2542d213':
Enable color temperature developer setting
Jason Monk [Fri, 15 Jan 2016 14:11:09 +0000 (14:11 +0000)]
Merge "Settings Hooks launch wrong activity"
am:
69704608f4
* commit '
69704608f4801a1362a28b37962f560d834da3da':
Settings Hooks launch wrong activity
Jason Monk [Fri, 15 Jan 2016 14:07:27 +0000 (14:07 +0000)]
Merge "Settings Hooks launch wrong activity"
Henrik Baard [Fri, 15 Jan 2016 07:40:49 +0000 (08:40 +0100)]
Settings Hooks launch wrong activity
The Operator and Manufacturer Hooks are broken, when
clicked they will launch WirelessSettings instead of
the activity intended to be launched.
The hook tile specifies a fragment which will be launched
when clicked. By removing this the tile will work as
intended.
Change-Id: I42d53698340cda676f4bab71857cc049d007803c
Steve Pfetsch [Thu, 14 Jan 2016 01:07:35 +0000 (17:07 -0800)]
Enable color temperature developer setting
Add a switch in Developer Settings to enable "cool" color temperature
mode.
Bug:
26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
Justin Harrison [Thu, 14 Jan 2016 02:08:36 +0000 (02:08 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev am:
0c38aca074
am:
9f6cb40ebc
* commit '
9f6cb40ebc8bcd12409bb73b8310420b89d43a83':
Add strings for color temperature developer option
Justin Harrison [Thu, 14 Jan 2016 02:04:47 +0000 (02:04 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
am:
0c38aca074
* commit '
0c38aca074d0e069eb214abc91eeb024b5121b73':
Add strings for color temperature developer option
Justin Harrison [Thu, 14 Jan 2016 01:56:42 +0000 (01:56 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
Steve Pfetsch [Wed, 13 Jan 2016 23:22:56 +0000 (15:22 -0800)]
Add strings for color temperature developer option
Introducing en-US strings for color temperature settings ahead of code
changes.
Bug:
26110238
Change-Id: I5a12aa35a730d93daa6383f7dde7d3c90db1d74b
Geoff Mendal [Wed, 13 Jan 2016 01:14:57 +0000 (01:14 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours am:
21e3d54adc -s ours am:
b994c93600 -s ours am:
0fc4bed550 -s ours
am:
b8d0b5323b -s ours
* commit '
b8d0b5323b2e01a36e242a74829670d2f3e6ae7f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:12:12 +0000 (01:12 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours am:
21e3d54adc -s ours am:
b994c93600 -s ours
am:
0fc4bed550 -s ours
* commit '
0fc4bed5503136cbd8bd474c33901a2ce9a98eae':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:10:08 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours am:
21e3d54adc -s ours
am:
b994c93600 -s ours
* commit '
b994c936002bacf9d6fe314f9ebef3432a58dd6c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:07:32 +0000 (01:07 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours
am:
21e3d54adc -s ours
* commit '
21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:05:38 +0000 (01:05 +0000)]
Import translations. DO NOT MERGE
am:
6a52aca8ea -s ours
* commit '
6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 00:44:04 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
Sungmin Choi [Mon, 11 Jan 2016 20:33:11 +0000 (20:33 +0000)]
Select or not Wi-Fi Calling preference as CarrierConfig am:
577add865a
am:
6a4d214ed6
* commit '
6a4d214ed6733efca5cb4217a64c4dd7b5a7e96d':
Select or not Wi-Fi Calling preference as CarrierConfig
Sungmin Choi [Mon, 11 Jan 2016 20:31:22 +0000 (20:31 +0000)]
Select or not Wi-Fi Calling preference as CarrierConfig
am:
577add865a
* commit '
577add865a0ca3d225b0fdc248b099ea05984a75':
Select or not Wi-Fi Calling preference as CarrierConfig
Sungmin Choi [Wed, 23 Dec 2015 05:24:52 +0000 (14:24 +0900)]
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
Mark Salyzyn [Fri, 8 Jan 2016 22:44:12 +0000 (22:44 +0000)]
Merge "whitelist "snet_event_log" when turning logs off"
am:
574814a4c2
* commit '
574814a4c2ac0e66cd14eb6370dba426bb6d5882':
whitelist "snet_event_log" when turning logs off
Mark Salyzyn [Fri, 8 Jan 2016 22:41:10 +0000 (22:41 +0000)]
Merge "whitelist "snet_event_log" when turning logs off"
Mark Salyzyn [Thu, 7 Jan 2016 17:19:14 +0000 (09:19 -0800)]
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
Alex Klyubin [Thu, 7 Jan 2016 19:12:44 +0000 (19:12 +0000)]
Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
am:
3ba482971b
* commit '
3ba482971b0f1709520ba9713fb11ac4727559c4':
[2/3] Remove unnecessary throws statement in ServiceManager
Alex Klyubin [Thu, 7 Jan 2016 19:08:26 +0000 (19:08 +0000)]
Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
Umair Khan [Thu, 7 Jan 2016 09:39:45 +0000 (15:09 +0530)]
[2/3] Remove unnecessary throws statement in ServiceManager
Change-Id: Ifcda96d3ccb411ba23b40ee5cf222c25843d8a0e
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Mark Salyzyn [Wed, 6 Jan 2016 19:19:36 +0000 (19:19 +0000)]
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
Mark Salyzyn [Wed, 6 Jan 2016 19:15:15 +0000 (19:15 +0000)]
Merge "Settings: switch to using ctl.start property instead of exec logcat"
Mark Salyzyn [Tue, 5 Jan 2016 23:51:46 +0000 (15:51 -0800)]
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
Jeff Sharkey [Tue, 5 Jan 2016 16:15:13 +0000 (16:15 +0000)]
Merge "Some text are missing in eject sdcard warning"
am:
24eaa7ed2b
* commit '
24eaa7ed2b2a709fd5ad2b45ad92de6e617e126a':
Some text are missing in eject sdcard warning
Jeff Sharkey [Tue, 5 Jan 2016 16:11:14 +0000 (16:11 +0000)]
Merge "Some text are missing in eject sdcard warning"
Amith Yamasani [Tue, 5 Jan 2016 00:31:12 +0000 (00:31 +0000)]
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
Amith Yamasani [Tue, 5 Jan 2016 00:26:43 +0000 (00:26 +0000)]
Merge "Fix "division by zero" crash after USB mass storage disconnects"
Jason Monk [Mon, 4 Jan 2016 14:42:31 +0000 (14:42 +0000)]
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.
Jason Monk [Mon, 4 Jan 2016 14:39:38 +0000 (14:39 +0000)]
Merge "fix out of memory with continuous entry and exit InstalledAppDetail."
daqiangx [Mon, 21 Dec 2015 08:02:25 +0000 (16:02 +0800)]
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>
Mark Salyzyn [Mon, 28 Dec 2015 18:49:04 +0000 (10:49 -0800)]
resolve merge conflicts of
f3cc23524f to mnc-dr2-dev-plus-aosp.
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
Mark Salyzyn [Mon, 28 Dec 2015 17:35:26 +0000 (17:35 +0000)]
Merge "Settings: Add option to disable logging"
Xinghan Yue [Mon, 28 Dec 2015 16:59:44 +0000 (17:59 +0100)]
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
Nick Kralevich [Wed, 23 Dec 2015 18:58:56 +0000 (10:58 -0800)]
Merge "Hide usb mode chooser dialog after disconnected"
am:
b913bf926e
* commit '
b913bf926e04280d0864cc36c759eddf88cf8b21':
Hide usb mode chooser dialog after disconnected
Nick Kralevich [Wed, 23 Dec 2015 18:55:09 +0000 (18:55 +0000)]
Merge "Hide usb mode chooser dialog after disconnected"
Mark Salyzyn [Tue, 22 Dec 2015 22:09:48 +0000 (14:09 -0800)]
Settings: Add option to disable logging
Bug:
26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
Svetoslav [Tue, 22 Dec 2015 19:44:00 +0000 (11:44 -0800)]
DO NOT MERGE Modify system settings: incorrect UI state am:
119d589ea5
am:
6e88d0b02f
* commit '
6e88d0b02f48d8b4c87f197ccca927373df99758':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 22 Dec 2015 19:42:06 +0000 (19:42 +0000)]
DO NOT MERGE Modify system settings: incorrect UI state
am:
119d589ea5
* commit '
119d589ea5aa9c2ccc5164279d718a20d0865f20':
DO NOT MERGE Modify system settings: incorrect UI state
Svetoslav [Tue, 24 Nov 2015 19:31:13 +0000 (11:31 -0800)]
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
356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
Du, Changbin [Thu, 17 Dec 2015 02:26:26 +0000 (10:26 +0800)]
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>
Henrik Baard [Mon, 14 Dec 2015 09:16:28 +0000 (10:16 +0100)]
Some text are missing in eject sdcard warning
The eject sdcard warning page shows incomplete texts
in some languages (german) and it is not apparant that
that you can scroll to see the text.
The layout is divided into three parts, the button
and one blank line, and the text. The text and the
blanke space will have equal parts of the screen
since they have the same weight. Because of this the
(complete) text is not shown in som languages.
Remove the blank part and let the text use the whole
screen.
Change-Id: Id8fd88fc6c0aa6105d64c100e3365cd9b00bf851
Geoff Mendal [Sat, 12 Dec 2015 02:07:11 +0000 (18:07 -0800)]
Import translations. DO NOT MERGE am:
1cb1ad2c55 -s ours
am:
ab3b13d0ed -s ours
* commit '
ab3b13d0edce3b89bd5836f8a9446a427b6c6acc':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 02:04:00 +0000 (18:04 -0800)]
Import translations. DO NOT MERGE
am:
1cb1ad2c55 -s ours
* commit '
1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 01:58:32 +0000 (17:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
Geoff Mendal [Sat, 12 Dec 2015 01:47:41 +0000 (17:47 -0800)]
Revert "Import translations. DO NOT MERGE" am:
7bafd5ee2f -s ours
am:
d2981b099e -s ours
* commit '
d2981b099e15e9f39ed8c69d06860ae74ecb497c':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 01:44:31 +0000 (17:44 -0800)]
Revert "Import translations. DO NOT MERGE"
am:
7bafd5ee2f -s ours
* commit '
7bafd5ee2f2c6fb3c3e3f456e855ab34c06f7c91':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 01:42:00 +0000 (01:42 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
df57be8aef6dd1760e72d7f76490048eeb425a3e.
Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
Geoff Mendal [Sat, 12 Dec 2015 00:36:21 +0000 (16:36 -0800)]
Import translations. DO NOT MERGE am:
df57be8aef -s ours
am:
bc84451452 -s ours
* commit '
bc844514522870bd3e70bba85a11ea824ff59e5b':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 00:30:09 +0000 (16:30 -0800)]
Import translations. DO NOT MERGE
am:
df57be8aef -s ours
* commit '
df57be8aef6dd1760e72d7f76490048eeb425a3e':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 00:05:26 +0000 (16:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
Hyejin Kim [Sun, 6 Dec 2015 18:42:11 +0000 (18:42 +0000)]
Add IMS settings to Network setting reset am:
623852f6c7
am:
c46bbd6373
* commit '
c46bbd637345e7dcfd637b1ba76896890e13bf5a':
Add IMS settings to Network setting reset
Hyejin Kim [Sun, 6 Dec 2015 18:37:50 +0000 (18:37 +0000)]
Add IMS settings to Network setting reset
am:
623852f6c7
* commit '
623852f6c772b7685abade493b304da1f71b4c00':
Add IMS settings to Network setting reset
Svetoslav Ganov [Thu, 3 Dec 2015 22:48:09 +0000 (22:48 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am:
c4321c7e6c -s ours
am:
142193550e -s ours
* commit '
142193550e6b9844631d4e34dda42e76424fed83':
[DO NOT MERGE] Modify system settings: incorrect UI state
Svetoslav Ganov [Thu, 3 Dec 2015 22:45:05 +0000 (22:45 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
am:
c4321c7e6c -s ours
* commit '
c4321c7e6caa1a3699567f9c39d2bc33bbf39c6b':
[DO NOT MERGE] Modify system settings: incorrect UI state
Svetoslav Ganov [Thu, 3 Dec 2015 22:38:54 +0000 (22:38 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
Svetoslav [Thu, 3 Dec 2015 22:36:30 +0000 (14:36 -0800)]
[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: I2da4eec1c3574bd6aef9ab968c9deb148536cb0a
Hyejin Kim [Thu, 5 Nov 2015 03:35:39 +0000 (12:35 +0900)]
Add IMS settings to Network setting reset
Add the factory reset function to be used to reset IMS settings
BUG=
25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
Geoff Mendal [Fri, 20 Nov 2015 04:44:18 +0000 (04:44 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours am:
74e9c3d348 -s ours am:
39be1461a8 -s ours
am:
bdbd6da522 -s ours
* commit '
bdbd6da522691b4cd7517e12e725676f2ee08983':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:24:46 +0000 (01:24 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours am:
74e9c3d348 -s ours
am:
39be1461a8 -s ours
* commit '
39be1461a876a4442e11dc26cff14ec80273baf0':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:19:50 +0000 (01:19 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours am:
75dd183bf7 -s ours
am:
74e9c3d348 -s ours
* commit '
74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:14:23 +0000 (01:14 +0000)]
Import translations. DO NOT MERGE am:
2102350ea3 -s ours
am:
75dd183bf7 -s ours
* commit '
75dd183bf7b99c995fe773e7b53a6604a6b53512':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:09:14 +0000 (01:09 +0000)]
Import translations. DO NOT MERGE
am:
2102350ea3 -s ours
* commit '
2102350ea33d8bbed50d9447889876fa295b3e8a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 00:58:46 +0000 (16:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
Russell Brenner [Tue, 17 Nov 2015 20:40:50 +0000 (20:40 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 20:40:38 +0000 (20:40 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93 am:
38e932dc81 am:
8199c3028c
am:
bcf3b75f57
* commit '
bcf3b75f5732cc270d1974edd2cf1ed48863cb31':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:32:03 +0000 (20:32 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b am:
8e4f6fbc2e am:
5950ff1d69 am:
2b29501039
am:
f0d538f08d
* commit '
f0d538f08da7c45e545e51e93373afe38cbd518f':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 20:31:54 +0000 (20:31 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93 am:
38e932dc81
am:
8199c3028c
* commit '
8199c3028c05cd9c85b6f26fe656518f536bda69':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:23:22 +0000 (20:23 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 20:23:06 +0000 (20:23 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours am:
439033dd93
am:
38e932dc81
* commit '
38e932dc816fe7aff6443bfa5648743f527aa097':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:14:22 +0000 (20:14 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 20:14:10 +0000 (20:14 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1 am:
6967df6421 -s ours
am:
439033dd93
* commit '
439033dd93417b98acff392865166503a507ff30':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 20:05:54 +0000 (20:05 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed am:
afe5eada5b
am:
8e4f6fbc2e
* commit '
8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
Block developer settings during SUW