OSDN Git Service
Mitchell Wills [Thu, 6 Aug 2015 02:45:46 +0000 (02:45 +0000)]
am
e69acd7a: am
104999b9: am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
e69acd7a456fb97d7c816629dedb42026eabdd2e':
Pass connection configuration when setting wifi info
Amit Mahajan [Thu, 6 Aug 2015 02:40:05 +0000 (02:40 +0000)]
am
e992c927: am
89718b2b: am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
e992c927ebba4bed96f86388f1601e3cc3c7c9e3':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Jim Miller [Thu, 6 Aug 2015 02:40:00 +0000 (02:40 +0000)]
am
5f96eb0c: am
6fdb85d3: am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
5f96eb0caf6db51751b2af6404c98037067ce29d':
Disable fingerprint when remotely reset by DPM
Yorke Lee [Thu, 6 Aug 2015 02:39:54 +0000 (02:39 +0000)]
am
7be1e286: am
cac65feb: am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
7be1e2864136e87ad473f35e54a6795c4a58df8d':
Correctly hide setConnectionService
Deepanshu Gupta [Thu, 6 Aug 2015 02:39:48 +0000 (02:39 +0000)]
am
0e0d254c: am
c34288be: am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
0e0d254c4ae1a744ebec1af70c11777d4d2f4525':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Mitchell Wills [Thu, 6 Aug 2015 02:37:19 +0000 (02:37 +0000)]
am
104999b9: am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
104999b957440251610dc31939938ef0c85ab23f':
Pass connection configuration when setting wifi info
Mitchell Wills [Thu, 6 Aug 2015 02:29:19 +0000 (02:29 +0000)]
am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
d14c48444a40fa2f964461e2f1317bcc3e256295':
Pass connection configuration when setting wifi info
Mitchell Wills [Thu, 6 Aug 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Pass connection configuration when setting wifi info" into mnc-dev
Amit Mahajan [Thu, 6 Aug 2015 01:57:58 +0000 (01:57 +0000)]
am
89718b2b: am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
89718b2bf8f0449b122bf1c8aba039c6a0575c21':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Jim Miller [Thu, 6 Aug 2015 01:57:54 +0000 (01:57 +0000)]
am
6fdb85d3: am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
6fdb85d383007e7d68895195d6347840276abeab':
Disable fingerprint when remotely reset by DPM
Yorke Lee [Thu, 6 Aug 2015 01:57:49 +0000 (01:57 +0000)]
am
cac65feb: am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
cac65febb7bf50f0bc03d897ebbafa8347c0de31':
Correctly hide setConnectionService
Deepanshu Gupta [Thu, 6 Aug 2015 01:57:46 +0000 (01:57 +0000)]
am
c34288be: am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
c34288be586028f949686e9a4fe7b84207bf2a6d':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Amit Mahajan [Thu, 6 Aug 2015 01:43:18 +0000 (01:43 +0000)]
am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
be948f5a9f519210c5522060ec9ee3bc77eb077e':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Jim Miller [Thu, 6 Aug 2015 01:43:13 +0000 (01:43 +0000)]
am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
120fc2c74eb290e06cddf1b52d363338f940c612':
Disable fingerprint when remotely reset by DPM
Yorke Lee [Thu, 6 Aug 2015 01:43:05 +0000 (01:43 +0000)]
am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
f0affc6d46849e844bec9ddc755ffae0042e443f':
Correctly hide setConnectionService
Deepanshu Gupta [Thu, 6 Aug 2015 01:42:43 +0000 (01:42 +0000)]
am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
2c1a22d91607e18c7618e79ab026d3c5c4ce8949':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Tim Murray [Wed, 5 Aug 2015 23:26:16 +0000 (23:26 +0000)]
am
ffd8889a: am
f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev
* commit '
ffd8889a96db0dadf01f6dfcd9393910d491fb91':
Add boost to increase the load on newly-forked zygote processes.
Tim Murray [Wed, 5 Aug 2015 23:20:45 +0000 (23:20 +0000)]
am
f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev
* commit '
f76806a9c0ddc8dd234ff746a52b74b19e7c2c12':
Add boost to increase the load on newly-forked zygote processes.
Tim Murray [Wed, 5 Aug 2015 23:10:50 +0000 (23:10 +0000)]
Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev
Amit Mahajan [Wed, 5 Aug 2015 23:09:58 +0000 (23:09 +0000)]
Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
Jim Miller [Wed, 5 Aug 2015 22:47:57 +0000 (22:47 +0000)]
Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
Mitchell Wills [Mon, 3 Aug 2015 16:46:08 +0000 (09:46 -0700)]
Pass connection configuration when setting wifi info
This allows the both the ssid and connection info to be verified when
updating wifi info.
Bug:
22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
Yorke Lee [Wed, 5 Aug 2015 22:13:07 +0000 (22:13 +0000)]
Merge "Correctly hide setConnectionService" into mnc-dev
Tim Murray [Wed, 5 Aug 2015 21:31:05 +0000 (14:31 -0700)]
Add boost to increase the load on newly-forked zygote processes.
Makes it more likely for app launches to end up on a large core in
an HMP environment.
bug
21915482
Change-Id: Ieac192a4bc1237dd03b9492fcad3a78de5510a58
Deepanshu Gupta [Wed, 5 Aug 2015 21:11:40 +0000 (21:11 +0000)]
Merge changes I85106f37,I7db398aa into mnc-dev
* changes:
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Paul Mclean [Wed, 5 Aug 2015 21:10:37 +0000 (21:10 +0000)]
am
eda52f0a: am
4d1128b2: am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
eda52f0a8e08d100daadddc4c875ebd7d25fa72f':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
Paul Mclean [Wed, 5 Aug 2015 21:06:33 +0000 (21:06 +0000)]
am
4d1128b2: am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
4d1128b2b97ab1b6cc711437a5bb5e4a86de6735':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
Paul Mclean [Wed, 5 Aug 2015 20:58:35 +0000 (20:58 +0000)]
am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
8eaf18b0ab77184f16870428258650bd12bb2ea5':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
Paul Mclean [Wed, 5 Aug 2015 20:50:29 +0000 (20:50 +0000)]
Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
Phil Burk [Wed, 5 Aug 2015 20:09:49 +0000 (20:09 +0000)]
am
65b33c92: am
7cc0cda1: am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
65b33c92acc0381acaed5de532bdc7c3e44c6bd5':
MidiManager: use ConcurrentHashMap
Jim Miller [Wed, 5 Aug 2015 20:03:21 +0000 (13:03 -0700)]
Disable fingerprint when remotely reset by DPM
When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password). This disables fingerprint like we do with
trust agents.
Fixes bug
21620081
Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
Paul McLean [Fri, 31 Jul 2015 15:28:22 +0000 (09:28 -0600)]
Documenting behavior of returning a 0-length array for formats,
channels, rates queries for analog devices.
Bug:
22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
Phil Burk [Wed, 5 Aug 2015 20:03:17 +0000 (20:03 +0000)]
am
7cc0cda1: am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
7cc0cda18e5e5bd235041fa2589999c6d4109127':
MidiManager: use ConcurrentHashMap
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:57:30 +0000 (19:57 +0000)]
am
c3213285: am
072097bd: am
8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '
c32132853f9eaf62ec59fa375a288b957c50e53a':
Keep OverScroller.SplineOverScroller state consistent.
Phil Burk [Wed, 5 Aug 2015 19:53:47 +0000 (19:53 +0000)]
am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
881cd15519535e493d497fefd857f8fe0236c774':
MidiManager: use ConcurrentHashMap
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:48:39 +0000 (19:48 +0000)]
am
072097bd: am
8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '
072097bd3f2b685b4b21d415c2b70cbca9eb76fd':
Keep OverScroller.SplineOverScroller state consistent.
Phil Burk [Wed, 5 Aug 2015 19:43:21 +0000 (19:43 +0000)]
Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:40:37 +0000 (19:40 +0000)]
am
8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '
8cc00243423e22a36c518cd5ece97b45271ae5e8':
Keep OverScroller.SplineOverScroller state consistent.
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:34:38 +0000 (19:34 +0000)]
Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
Yohei Yukawa [Wed, 5 Aug 2015 18:20:18 +0000 (18:20 +0000)]
am
721a1fcd: am
a512415e: am
db221acc: Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
* commit '
721a1fcd88a4e1b3eeb11c1c6f4739abe4e6f315':
Reduce log spam for the ease of debugging Bug
22857361.
Ajay Panicker [Wed, 5 Aug 2015 18:20:12 +0000 (18:20 +0000)]
am
1820dc06: am
106e4f4c: am
cda6e878: Implement Bluetooth settings factory reset (2/5)
* commit '
1820dc06a3cd5ea81a88ba3bc799146b51937d89':
Implement Bluetooth settings factory reset (2/5)
Yohei Yukawa [Wed, 5 Aug 2015 18:16:33 +0000 (18:16 +0000)]
am
a512415e: am
db221acc: Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
* commit '
a512415e13def82532e89fa763f3c8b5ce8bcc7c':
Reduce log spam for the ease of debugging Bug
22857361.
Amit Mahajan [Wed, 5 Aug 2015 18:11:56 +0000 (11:11 -0700)]
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Bug:
22942869
Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228
Ajay Panicker [Wed, 5 Aug 2015 18:10:35 +0000 (18:10 +0000)]
am
106e4f4c: am
cda6e878: Implement Bluetooth settings factory reset (2/5)
* commit '
106e4f4ca06003ed2cf57bddb24f46a1142cdc49':
Implement Bluetooth settings factory reset (2/5)
Tyler Gunn [Wed, 5 Aug 2015 18:09:50 +0000 (18:09 +0000)]
am
5082b180: am
ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
* commit '
5082b180c6038fef37b6fcf227373f25d5f842d1':
Remove EXTRA_CALL_HISTORY_INFO.
Yohei Yukawa [Wed, 5 Aug 2015 18:07:16 +0000 (18:07 +0000)]
am
db221acc: Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
* commit '
db221acce269245d630e8eb456501c5c6241447b':
Reduce log spam for the ease of debugging Bug
22857361.
Ajay Panicker [Wed, 5 Aug 2015 18:01:10 +0000 (18:01 +0000)]
am
cda6e878: Implement Bluetooth settings factory reset (2/5)
* commit '
cda6e878cd1b11e10c0b9b4b903b14e11586a963':
Implement Bluetooth settings factory reset (2/5)
Yohei Yukawa [Wed, 5 Aug 2015 17:59:23 +0000 (17:59 +0000)]
Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
Tyler Gunn [Wed, 5 Aug 2015 17:58:23 +0000 (17:58 +0000)]
am
ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
* commit '
ffb72473c67c13c75421f5df979404407ff01bb4':
Remove EXTRA_CALL_HISTORY_INFO.
Svetoslav Ganov [Wed, 5 Aug 2015 17:51:17 +0000 (17:51 +0000)]
am
e7359b09: am
ef7deb90: am
e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
* commit '
e7359b09c7ab50fa9d92f0df3dddecd8d0111682':
Fix app ops regressions introduced by the per UID policy change
Tyler Gunn [Wed, 5 Aug 2015 17:47:14 +0000 (17:47 +0000)]
Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
Mitchell Wills [Wed, 5 Aug 2015 17:44:39 +0000 (17:44 +0000)]
am
bf026e68: am
b0e9e731: am
bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit '
bf026e68d3fc11a4d0ba68429c8fc2d75e62f2ff':
Fix incorrect default wifi power draw values
Svetoslav Ganov [Wed, 5 Aug 2015 17:43:36 +0000 (17:43 +0000)]
am
ef7deb90: am
e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
* commit '
ef7deb90ac000b5977208e965e0bd84e247140e9':
Fix app ops regressions introduced by the per UID policy change
Rubin Xu [Wed, 5 Aug 2015 17:39:08 +0000 (17:39 +0000)]
am
6b6b9cd9: am
01496367: am
ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit '
6b6b9cd911104020e8af2250fd531d2ccc344c69':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Makoto Onuki [Wed, 5 Aug 2015 17:39:02 +0000 (17:39 +0000)]
am
84c1eb6d: am
a29e0501: am
86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
* commit '
84c1eb6d24c73a47871cd1c0f5bfb9e0b69986d2':
READ_SMS allows getLine1Number() [1/3]
Svetoslav Ganov [Wed, 5 Aug 2015 17:38:31 +0000 (17:38 +0000)]
am
e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
* commit '
e72377e17a837acbe1e537ac737731f6b869fe1e':
Fix app ops regressions introduced by the per UID policy change
Ajay Panicker [Tue, 28 Jul 2015 23:52:09 +0000 (16:52 -0700)]
Implement Bluetooth settings factory reset (2/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug:
16161518
Svetoslav Ganov [Wed, 5 Aug 2015 17:22:42 +0000 (17:22 +0000)]
Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
Mitchell Wills [Wed, 5 Aug 2015 17:20:04 +0000 (17:20 +0000)]
am
b0e9e731: am
bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit '
b0e9e731f284601fb6f544596d4c5973df111355':
Fix incorrect default wifi power draw values
Mitchell Wills [Wed, 5 Aug 2015 17:09:22 +0000 (17:09 +0000)]
am
bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit '
bce3eb22afcd57b7f1bdde26030f8c44bb885a4b':
Fix incorrect default wifi power draw values
Rubin Xu [Wed, 5 Aug 2015 17:09:00 +0000 (17:09 +0000)]
am
01496367: am
ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit '
0149636785a00eced7aeb97a6b5606c46582d05c':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Makoto Onuki [Wed, 5 Aug 2015 17:08:56 +0000 (17:08 +0000)]
am
a29e0501: am
86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
* commit '
a29e05012db02c4ed87eb8c31c2138e966f742b5':
READ_SMS allows getLine1Number() [1/3]
Niels Egberts [Wed, 5 Aug 2015 17:03:08 +0000 (17:03 +0000)]
am
8e4a16b8: am
a02bd53e: am
6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
* commit '
8e4a16b81623a21abe02898c172d9201567ff193':
NPE occured when trying to parcel voice features.
Ian Pedowitz [Wed, 5 Aug 2015 17:03:02 +0000 (17:03 +0000)]
am
76b07705: am
4d2eec14: am
df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit '
76b07705585fbe7bf8b744b09ac9f8aa4c8c9b5f':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
Rubin Xu [Wed, 5 Aug 2015 17:00:58 +0000 (17:00 +0000)]
am
ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit '
ab868effb7a54bc6a6b2d35412fe466c0adc7f55':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Makoto Onuki [Wed, 5 Aug 2015 17:00:53 +0000 (17:00 +0000)]
am
86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
* commit '
86ee3a57e428b14023bc0bdbd6cb8f8bc206be74':
READ_SMS allows getLine1Number() [1/3]
Mitchell Wills [Wed, 5 Aug 2015 16:59:23 +0000 (16:59 +0000)]
Merge "Fix incorrect default wifi power draw values" into mnc-dev
Rubin Xu [Wed, 5 Aug 2015 16:55:50 +0000 (16:55 +0000)]
Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
Makoto Onuki [Wed, 5 Aug 2015 16:55:35 +0000 (16:55 +0000)]
Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
Niels Egberts [Wed, 5 Aug 2015 16:55:26 +0000 (16:55 +0000)]
am
a02bd53e: am
6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
* commit '
a02bd53edefa6868829602675c068926ef270c63':
NPE occured when trying to parcel voice features.
Ian Pedowitz [Wed, 5 Aug 2015 16:55:22 +0000 (16:55 +0000)]
am
4d2eec14: am
df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit '
4d2eec1434f08667999b9cc51e6cf6f7146003e5':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
Niels Egberts [Wed, 5 Aug 2015 16:48:24 +0000 (16:48 +0000)]
am
6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
* commit '
6bdc4637d7ac1df86e9d745ac483987107a71282':
NPE occured when trying to parcel voice features.
Ian Pedowitz [Wed, 5 Aug 2015 16:48:18 +0000 (16:48 +0000)]
am
df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit '
df5a66110777554d5b163693ac8395d7c21c328f':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
Geoff Mendal [Wed, 5 Aug 2015 16:35:35 +0000 (16:35 +0000)]
am
c0d2e7a6: (-s ours) am
e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c0d2e7a6fb294fcf27039ea0157fbbde17a9b1a1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 16:28:59 +0000 (16:28 +0000)]
am
e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
e229337b34a92f99ed25f92479753e9dfd113a96':
Import translations. DO NOT MERGE
Rubin Xu [Wed, 5 Aug 2015 15:29:13 +0000 (16:29 +0100)]
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Starting from M, this extra is also supported in NFC bump provisioning.
Bug:
22914251
Change-Id: I835d12918c5de4ff782245def6565eeb0f052934
Geoff Mendal [Wed, 5 Aug 2015 16:19:53 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Niels Egberts [Wed, 5 Aug 2015 15:57:55 +0000 (15:57 +0000)]
Merge "NPE occured when trying to parcel voice features." into mnc-dev
Geoff Mendal [Wed, 5 Aug 2015 15:48:06 +0000 (10:48 -0500)]
Import translations. DO NOT MERGE
Change-Id: I8fe682739483119d031a29310670d8abfc81bedd
Auto-generated-cl: translation import
Niels Egberts [Wed, 5 Aug 2015 14:41:18 +0000 (15:41 +0100)]
NPE occured when trying to parcel voice features.
The default features member should be an empty list instead of null.
Bug:
22404239
Change-Id: Ia39982f17fd3b3cd0f3556435170aed2fac14fb8
Ian Pedowitz [Wed, 5 Aug 2015 14:34:13 +0000 (14:34 +0000)]
Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
Geoff Mendal [Wed, 5 Aug 2015 14:26:06 +0000 (14:26 +0000)]
am
28739294: (-s ours) am
90b69615: (-s ours) Import translations. DO NOT MERGE
* commit '
28739294c1020bde477a44bd42575d8c640ddc18':
Import translations. DO NOT MERGE
Ian Pedowitz [Wed, 5 Aug 2015 14:23:43 +0000 (14:23 +0000)]
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
This reverts commit
845d14db9066c3262f270237b52e315aa71508b2.
Bug:
22942480
Bug:
22902898
Change-Id: If2d0e11594284414953c3dd45475fc7ba3366295
Geoff Mendal [Wed, 5 Aug 2015 14:20:31 +0000 (14:20 +0000)]
am
90b69615: (-s ours) Import translations. DO NOT MERGE
* commit '
90b69615706cee73363c3420e2d81a184f9acc07':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 13:53:22 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41
Auto-generated-cl: translation import
Paul Jensen [Wed, 5 Aug 2015 11:32:19 +0000 (11:32 +0000)]
am
95297732: am
86e7d135: resolved conflicts for merge of
dbc4edcc to mnc-dr-dev
* commit '
952977322215b990f5aa6898bfaa40bb064545f4':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 5 Aug 2015 11:24:18 +0000 (11:24 +0000)]
am
86e7d135: resolved conflicts for merge of
dbc4edcc to mnc-dr-dev
* commit '
86e7d135acbdb0055de6a687817d44ac60603c9f':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 5 Aug 2015 11:07:24 +0000 (07:07 -0400)]
resolved conflicts for merge of
dbc4edcc to mnc-dr-dev
Change-Id: I3a8624b2b375e0d174983d7690082e0e6932c4de
Paul Jensen [Wed, 5 Aug 2015 10:03:47 +0000 (10:03 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
Yohei Yukawa [Wed, 5 Aug 2015 05:11:11 +0000 (22:11 -0700)]
Reduce log spam for the ease of debugging Bug
22857361.
Now InputMethodManagerService generates the following log
Couldn't create dir.: /data/system/inputmethod
not only when it fails to create the directory but also when
/data/system/inputmethod already exists, which makes it
difficult for us to figure out the root cause of boot failure
on emulator environments (Bug
22857361).
With this CL, IMMS no longer shows the message when the
directory already exists. Basically this is no risk change,
which changes only the condition to show the logging message.
Bug:
22857361
Change-Id: I09aaf501b19845c8309b09b57c23077f1757cd1a
Roozbeh Pournader [Wed, 5 Aug 2015 03:35:55 +0000 (03:35 +0000)]
am
37b18434: am
815a6b6b: am
519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
* commit '
37b1843417b1362530b51b1d5c5f8bda06a7c92e':
Create a special CONSTRAINED font bucket in frameworks.
Roozbeh Pournader [Wed, 5 Aug 2015 03:23:55 +0000 (03:23 +0000)]
am
815a6b6b: am
519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
* commit '
815a6b6bdf400413057c83fa0ee63db749785d85':
Create a special CONSTRAINED font bucket in frameworks.
Roozbeh Pournader [Wed, 5 Aug 2015 03:16:35 +0000 (03:16 +0000)]
am
519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
* commit '
519adb50ebd45b8ecd1a8b8abbb975e35bb42974':
Create a special CONSTRAINED font bucket in frameworks.
Roozbeh Pournader [Wed, 5 Aug 2015 03:04:58 +0000 (03:04 +0000)]
Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
Svetoslav [Wed, 5 Aug 2015 02:03:40 +0000 (19:03 -0700)]
Fix app ops regressions introduced by the per UID policy change
1. Add a missing statement in the parsing code
2. Notify for all packages on UID ap op policy change
bug:
22957162
Change-Id: Ic2bd5d07ef52be207e66b63ffe45fd8a456eb5a8
xin He [Wed, 5 Aug 2015 01:33:43 +0000 (01:33 +0000)]
am
97b46064: am
3832b13c: am
54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
* commit '
97b4606422afc43dcf93d0452325297a2ce70abd':
Boot loop when SSID has non UTF-8 character in the name
xin He [Wed, 5 Aug 2015 01:27:12 +0000 (01:27 +0000)]
am
3832b13c: am
54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
* commit '
3832b13c1fe316be416bacb1f1badc5e67f44b4e':
Boot loop when SSID has non UTF-8 character in the name
xin He [Wed, 5 Aug 2015 01:18:06 +0000 (01:18 +0000)]
am
54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
* commit '
54cea23479b6c44c5ac40b4f34edf29df311bb91':
Boot loop when SSID has non UTF-8 character in the name
xin He [Wed, 5 Aug 2015 01:10:34 +0000 (01:10 +0000)]
Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
Jae Seo [Wed, 5 Aug 2015 00:27:40 +0000 (00:27 +0000)]
am
229347ec: am
c632313e: am
2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev
* commit '
229347ec319aedfc76aac4eca9b33e74814807ba':
Unregister the existing callback when MediaProjection stops
OSDN Git Service
