Geoff Mendal
ee38f84a66
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ours am: b994c93600 -s ours am: 0fc4bed550 -s ours
...
am: b8d0b5323b
2016-01-13 01:14:57 +00:00
Geoff Mendal
b8d0b5323b
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ours am: b994c93600 -s ours
...
am: 0fc4bed550
2016-01-13 01:12:12 +00:00
Geoff Mendal
0fc4bed550
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ours
...
am: b994c93600
2016-01-13 01:10:08 +00:00
Geoff Mendal
b994c93600
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours
...
am: 21e3d54adc
2016-01-13 01:07:32 +00:00
Geoff Mendal
21e3d54adc
Import translations. DO NOT MERGE
...
am: 6a52aca8ea
2016-01-13 01:05:38 +00:00
Geoff Mendal
6a52aca8ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
2016-01-12 16:44:04 -08:00
Sungmin Choi
5a1e5edeb7
Select or not Wi-Fi Calling preference as CarrierConfig am: 577add865a
...
am: 6a4d214ed6
2016-01-11 20:33:11 +00:00
Sungmin Choi
6a4d214ed6
Select or not Wi-Fi Calling preference as CarrierConfig
...
am: 577add865a
2016-01-11 20:31:22 +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
2016-01-08 22:44:12 +00:00
Mark Salyzyn
574814a4c2
Merge "whitelist "snet_event_log" when turning logs off"
2016-01-08 22:41:10 +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
2016-01-07 19:12:44 +00:00
Alex Klyubin
3ba482971b
Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
2016-01-07 19:08:26 +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
2016-01-06 19:19:36 +00:00
Mark Salyzyn
5987a26e78
Merge "Settings: switch to using ctl.start property instead of exec logcat"
2016-01-06 19:15:15 +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
Jeff Sharkey
c088ea23eb
Merge "Some text are missing in eject sdcard warning"
...
am: 24eaa7ed2b
2016-01-05 16:15:13 +00:00
Jeff Sharkey
24eaa7ed2b
Merge "Some text are missing in eject sdcard warning"
2016-01-05 16:11:14 +00:00
Amith Yamasani
4ed2bb1ba9
Merge "Fix "division by zero" crash after USB mass storage disconnects"
...
am: a44b4feed4
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
2016-01-04 14:42:31 +00:00
Jason Monk
d298d474e6
Merge "fix out of memory with continuous entry and exit InstalledAppDetail."
2016-01-04 14:39:38 +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
2015-12-23 10:58:56 -08:00
Nick Kralevich
b913bf926e
Merge "Hide usb mode chooser dialog after disconnected"
2015-12-23 18:55:09 +00: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
2015-12-22 11:44:00 -08:00
Svetoslav
6e88d0b02f
DO NOT MERGE Modify system settings: incorrect UI state
...
am: 119d589ea5
2015-12-22 19:42:06 +00: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
Henrik Baard
2984b2b791
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
2015-12-14 12:23:10 +01:00
Geoff Mendal
6419a4a6e2
Import translations. DO NOT MERGE am: 1cb1ad2c55 -s ours
...
am: ab3b13d0ed
2015-12-11 18:07:11 -08:00
Geoff Mendal
ab3b13d0ed
Import translations. DO NOT MERGE
...
am: 1cb1ad2c55
2015-12-11 18:04:00 -08:00
Geoff Mendal
1cb1ad2c55
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
2015-12-11 17:58:32 -08:00
Geoff Mendal
4f86f6274a
Revert "Import translations. DO NOT MERGE" am: 7bafd5ee2f -s ours
...
am: d2981b099e
2015-12-11 17:47:41 -08:00
Geoff Mendal
d2981b099e
Revert "Import translations. DO NOT MERGE"
...
am: 7bafd5ee2f
2015-12-11 17:44:31 -08:00
Geoff Mendal
7bafd5ee2f
Revert "Import translations. DO NOT MERGE"
...
This reverts commit df57be8aef
2015-12-12 01:42:00 +00:00
Geoff Mendal
819e07fbbe
Import translations. DO NOT MERGE am: df57be8aef -s ours
...
am: bc84451452
2015-12-11 16:36:21 -08:00
Geoff Mendal
bc84451452
Import translations. DO NOT MERGE
...
am: df57be8aef
2015-12-11 16:30:09 -08:00
Geoff Mendal
df57be8aef
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
2015-12-11 16:05:26 -08:00
Hyejin Kim
00bc7567b8
Add IMS settings to Network setting reset am: 623852f6c7
...
am: c46bbd6373
2015-12-06 18:42:11 +00:00
Hyejin Kim
c46bbd6373
Add IMS settings to Network setting reset
...
am: 623852f6c7
2015-12-06 18:37:50 +00:00
Svetoslav Ganov
994779c61e
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am: c4321c7e6c -s ours
...
am: 142193550e
2015-12-03 22:48:09 +00:00
Svetoslav Ganov
142193550e
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
...
am: c4321c7e6c
2015-12-03 22:45:05 +00:00
Svetoslav Ganov
c4321c7e6c
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
2015-12-03 22:38:54 +00:00
