OSDN Git Service
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
Russell Brenner [Tue, 17 Nov 2015 20:05:43 +0000 (20:05 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am:
14bf226c79 am:
97759fa8d1
am:
6967df6421 -s ours
* commit '
6967df642114a9c84d993cfd544d5a32f04c26b1':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 19:57:00 +0000 (19:57 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am:
56d630a3ed
am:
afe5eada5b
* commit '
afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:56:48 +0000 (19:56 +0000)]
[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
Russell Brenner [Tue, 17 Nov 2015 19:53:17 +0000 (19:53 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
am:
56d630a3ed
* commit '
56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
Block developer settings during SUW
Russell Brenner [Tue, 17 Nov 2015 19:51:09 +0000 (19:51 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
am:
14bf226c79
* commit '
14bf226c79ee16fc5dd502d81e12bf18b932f39e':
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:47:46 +0000 (01:47 +0000)]
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
Russell Brenner [Tue, 17 Nov 2015 01:37:51 +0000 (01:37 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am:
f0ff1631de am:
2075d98be6
am:
7d44fe6fdb
* commit '
7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63':
Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 01:29:12 +0000 (01:29 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am:
f0ff1631de
am:
2075d98be6
* commit '
2075d98be6199032d0bdf65d9e1789153e12fb66':
Preserve FRP lock if wiped during SUW
Sanket Padawe [Tue, 17 Nov 2015 01:28:09 +0000 (01:28 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4 am:
28eca8e8c2 am:
773b8a3c44
am:
60461f3410
* commit '
60461f3410151716d34d87ae1ca4ad00620b72eb':
Uncheck checkbox for contact sharing by default for non carkit devices.
Russell Brenner [Tue, 17 Nov 2015 01:22:41 +0000 (01:22 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
am:
f0ff1631de
* commit '
f0ff1631dee1d988151f8260e6c65ff836a40e80':
Preserve FRP lock if wiped during SUW
Sanket Padawe [Tue, 17 Nov 2015 01:22:25 +0000 (01:22 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4 am:
28eca8e8c2
am:
773b8a3c44
* commit '
773b8a3c4422ab9daf7adb62895568852b43882e':
Uncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Tue, 17 Nov 2015 01:16:41 +0000 (01:16 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
98f11fd1a4
am:
28eca8e8c2
* commit '
28eca8e8c2d9e11a9f304e85ff3a34819edd68a9':
Uncheck checkbox for contact sharing by default for non carkit devices.
Russell Brenner [Tue, 17 Nov 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
Russell Brenner [Tue, 17 Nov 2015 01:13:55 +0000 (01:13 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
Sanket Padawe [Tue, 17 Nov 2015 01:12:09 +0000 (01:12 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices.
am:
98f11fd1a4
* commit '
98f11fd1a4752beed56b5fe7a4097ec0ae0c74b3':
Uncheck checkbox for contact sharing by default for non carkit devices.
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
[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
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
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
Robin Lee [Fri, 13 Nov 2015 14:11:32 +0000 (14:11 +0000)]
Merge "VPN settings: grey out policy-restricted menus" am:
ee4808d37b
am:
905829393d
* commit '
905829393d85db3e5d3f4b18a37c5da7184e6a63':
VPN settings: grey out policy-restricted menus
Robin Lee [Fri, 13 Nov 2015 14:08:52 +0000 (14:08 +0000)]
Merge "VPN settings: grey out policy-restricted menus"
am:
ee4808d37b
* commit '
ee4808d37b955299501e9b753cc7bb19877d4f83':
VPN settings: grey out policy-restricted menus
Robin Lee [Fri, 13 Nov 2015 14:07:05 +0000 (14:07 +0000)]
Merge "VPN settings: grey out policy-restricted menus"
Robin Lee [Fri, 16 Oct 2015 11:37:59 +0000 (12:37 +0100)]
VPN settings: grey out policy-restricted menus
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.
Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
Sanket Padawe [Fri, 13 Nov 2015 00:07:06 +0000 (00:07 +0000)]
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.
Sanket Padawe [Fri, 13 Nov 2015 00:02:30 +0000 (00:02 +0000)]
Uncheck checkbox for contact sharing by default for non carkit devices. am:
dbc47fb262
am:
0ad16831ee
* commit '
0ad16831ee2e2029a0fc2891c8007505bb9779cd':
Uncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Thu, 12 Nov 2015 23:57:48 +0000 (23:57 +0000)]
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.
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
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
dbc47fb262a4273417d99dabab757854aa3b0eaf)
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
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
Russell Brenner [Mon, 9 Nov 2015 19:35:42 +0000 (11:35 -0800)]
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
Jason Monk [Mon, 9 Nov 2015 22:40:33 +0000 (22:40 +0000)]
Null check queryIntentServices am:
a4c9492b50 am:
e27cada8c4
am:
e198f7b84f
* commit '
e198f7b84fde2b3ca3f0e0c9195166b06363850e':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 22:36:21 +0000 (22:36 +0000)]
Null check queryIntentServices am:
a4c9492b50
am:
e27cada8c4
* commit '
e27cada8c49c8aec2463c352faf5211502b1b372':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 22:31:51 +0000 (22:31 +0000)]
Null check queryIntentServices
am:
a4c9492b50
* commit '
a4c9492b50b742488a6a92abdc290b5ada3c004b':
Null check queryIntentServices
Jason Monk [Mon, 9 Nov 2015 21:56:46 +0000 (16:56 -0500)]
Null check queryIntentServices
Bug:
25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
Baligh Uddin [Thu, 5 Nov 2015 19:40:21 +0000 (19:40 +0000)]
Import translations. DO NOT MERGE
am:
7b9f79bb6e -s ours
* commit '
7b9f79bb6e6c72adae3e9674617b5b9c45c769bd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 4 Nov 2015 20:11:39 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I38ff46207ad622dc25f4cbbf6445ceac1dcfedb7
Jason Monk [Wed, 4 Nov 2015 15:02:47 +0000 (15:02 +0000)]
Merge "Don\'t show MIDI USB option if not supported" am:
c2a9cd03f7
am:
92aafd3ed5
* commit '
92aafd3ed5391eb5b172c54e6ea820dd36110c99':
Don't show MIDI USB option if not supported
Jason Monk [Wed, 4 Nov 2015 14:56:04 +0000 (14:56 +0000)]
Merge "Don\'t show MIDI USB option if not supported"
am:
c2a9cd03f7
* commit '
c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
Don't show MIDI USB option if not supported
Jason Monk [Wed, 4 Nov 2015 14:43:11 +0000 (14:43 +0000)]
Merge "Don't show MIDI USB option if not supported"
Zoran Jovanovic [Wed, 4 Nov 2015 13:00:03 +0000 (14:00 +0100)]
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
Dianne Hackborn [Fri, 30 Oct 2015 17:27:44 +0000 (17:27 +0000)]
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
* commit '
44643bad268fa65d8a5d95055a8a9c2c4bf86fdf':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:24:34 +0000 (17:24 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
3b4e4dd91d
am:
a42bad972c
* commit '
a42bad972ca44f52ac84b3139198acc11dec0d4f':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:20:13 +0000 (17:20 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am:
3b4e4dd91d
* commit '
3b4e4dd91d416c93fdc0326e54469ceabb8281ab':
Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Fri, 30 Oct 2015 17:16:20 +0000 (17:16 +0000)]
Merge "Further tweak to issue #issue #
25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
Dianne Hackborn [Fri, 30 Oct 2015 00:32:28 +0000 (17:32 -0700)]
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
Dianne Hackborn [Thu, 29 Oct 2015 23:46:20 +0000 (23:46 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
508559d076 am:
68954d930d
am:
2af9128966
* commit '
2af9128966ee855d6c8e06479562cb141c625511':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:43:04 +0000 (23:43 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am:
508559d076
am:
68954d930d
* commit '
68954d930d0a583c7150e1a3959d5a798b8e5f34':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
Dianne Hackborn [Thu, 29 Oct 2015 23:39:39 +0000 (23:39 +0000)]
Merge "Fix issue #
25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev
am:
508559d076
* commit '
508559d0760596509f07fa56371c6e18d8bd9559':
Fix issue #
25371736: Don't include z-ram allocations in Android OS
OSDN Git Service
