OSDN Git Service
Julia Reynolds [Thu, 6 Aug 2015 14:06:19 +0000 (14:06 +0000)]
am
4b74d669: am
48d146c9: am
c694ab32: am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
4b74d6693e2ea7248de79332a020672ece19b100':
Store ringer mode on entering DND mode so it can be restored on exit.
Julia Reynolds [Thu, 6 Aug 2015 14:01:40 +0000 (14:01 +0000)]
am
48d146c9: am
c694ab32: am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
48d146c9d66abd3002a8bc6b7245e4c34b6fcff5':
Store ringer mode on entering DND mode so it can be restored on exit.
Julia Reynolds [Thu, 6 Aug 2015 13:54:43 +0000 (13:54 +0000)]
am
c694ab32: am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
c694ab32846da54f7fc00dea42ded9b98c6f148f':
Store ringer mode on entering DND mode so it can be restored on exit.
Julia Reynolds [Thu, 6 Aug 2015 13:48:41 +0000 (13:48 +0000)]
am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
a3b5a61271bde79ef1072b13ed14525ce53bf62b':
Store ringer mode on entering DND mode so it can be restored on exit.
Julia Reynolds [Thu, 6 Aug 2015 13:41:01 +0000 (13:41 +0000)]
Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
Geoff Mendal [Thu, 6 Aug 2015 04:42:31 +0000 (04:42 +0000)]
am
ecbd1cef: (-s ours) am
511cf5b8: (-s ours) am
227d704f: (-s ours) am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ecbd1cef9cf884f5d34ea36baa1c1496a48751ec':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:36:41 +0000 (04:36 +0000)]
am
511cf5b8: (-s ours) am
227d704f: (-s ours) am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
511cf5b88230910bac312f160e289650da896253':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:29:54 +0000 (04:29 +0000)]
am
227d704f: (-s ours) am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
227d704f64cb7783b8626770ddbbfb151c843f99':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:37 +0000 (04:20 +0000)]
am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
375c792c176be43720da47db2cfced23613f537c':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:12:38 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Mitchell Wills [Thu, 6 Aug 2015 02:56:36 +0000 (02:56 +0000)]
am
0b09eefa: am
e69acd7a: am
104999b9: am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
0b09eefa35066e4c43300dcd5b38689c6114b1a2':
Pass connection configuration when setting wifi info
Amit Mahajan [Thu, 6 Aug 2015 02:48:56 +0000 (02:48 +0000)]
am
b7c41991: am
e992c927: am
89718b2b: am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
b7c419919fce63300f35012a2309a57a8757b0a0':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Jim Miller [Thu, 6 Aug 2015 02:48:51 +0000 (02:48 +0000)]
am
4a66bbf7: am
5f96eb0c: am
6fdb85d3: am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
4a66bbf7fdbd9f96ea4f6d6fe1a63408dd70bd27':
Disable fingerprint when remotely reset by DPM
Yorke Lee [Thu, 6 Aug 2015 02:48:45 +0000 (02:48 +0000)]
am
e80dbaeb: am
7be1e286: am
cac65feb: am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
e80dbaebd3b9d684b6eea253a998e5d12a8701d7':
Correctly hide setConnectionService
Deepanshu Gupta [Thu, 6 Aug 2015 02:48:39 +0000 (02:48 +0000)]
am
0889fd29: am
0e0d254c: am
c34288be: am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
0889fd295974ce589ccd0e7a44932012ede577db':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
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.
Yusuke Sato [Thu, 6 Aug 2015 01:40:24 +0000 (01:40 +0000)]
am
61234dea: am
bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '
61234deafe78ded05569edfab24536cdb4bd7720':
Clean up AssetManager::scanAndMergeZipLocked
Geoff Mendal [Thu, 6 Aug 2015 00:54:19 +0000 (17:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22842106
Change-Id: I473bc0dc200e1eec3bd0f907526fcf808ee86e36
Yusuke Sato [Wed, 5 Aug 2015 23:38:47 +0000 (23:38 +0000)]
am
bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '
bd4c482be9c060d92919080c37e0d14fca94d2aa':
Clean up AssetManager::scanAndMergeZipLocked
Tim Murray [Wed, 5 Aug 2015 23:32:45 +0000 (23:32 +0000)]
am
34f4e88d: am
ffd8889a: am
f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev
* commit '
34f4e88d7e08b2c2cbfb28b3c7f7aa627709f95b':
Add boost to increase the load on newly-forked zygote processes.
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
Yusuke Sato [Wed, 5 Aug 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Clean up AssetManager::scanAndMergeZipLocked"
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
Paul Mclean [Wed, 5 Aug 2015 21:20:45 +0000 (21:20 +0000)]
am
29e678b9: 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 '
29e678b9c77fa75232b4b9e147430a920e6f6cc4':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
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
Yusuke Sato [Wed, 5 Aug 2015 20:34:31 +0000 (20:34 +0000)]
Merge "Fix build breakage caused by r.android.com/162907" into mnc-dr-dev-plus-aosp
Phil Burk [Wed, 5 Aug 2015 20:17:37 +0000 (20:17 +0000)]
am
8d5e35ad: am
65b33c92: am
7cc0cda1: am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
8d5e35ad8129e19b64bf1ecbe58764863fb4633c':
MidiManager: use ConcurrentHashMap
Yusuke Sato [Wed, 5 Aug 2015 20:14:53 +0000 (13:14 -0700)]
Fix build breakage caused by r.android.com/162907
Change-Id: Ifeb7b57ce79f3d8c0edadf03d14853e72840d49e
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
Vladislav Kaznacheev [Wed, 5 Aug 2015 20:07:54 +0000 (20:07 +0000)]
am
469840aa: am
c3213285: am
072097bd: am
8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '
469840aa48e30d96a1f5329d38e177ab18b924d9':
Keep OverScroller.SplineOverScroller state consistent.
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
Yusuke Sato [Wed, 5 Aug 2015 19:09:41 +0000 (19:09 +0000)]
am
3383b141: am
a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
* commit '
3383b141c3ac4426279e649ebcee535890203c3f':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
Yohei Yukawa [Wed, 5 Aug 2015 18:29:09 +0000 (18:29 +0000)]
am
524e2f9c: am
721a1fcd: am
a512415e: am
db221acc: Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
* commit '
524e2f9c763adac6a6e02ccf85f77bc4b7a4fbca':
Reduce log spam for the ease of debugging Bug
22857361.
Ajay Panicker [Wed, 5 Aug 2015 18:29:04 +0000 (18:29 +0000)]
am
c89da1c7: am
1820dc06: am
106e4f4c: am
cda6e878: Implement Bluetooth settings factory reset (2/5)
* commit '
c89da1c70c3f202052f85ccca9145eda04817deb':
Implement Bluetooth settings factory reset (2/5)
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)
Tyler Gunn [Wed, 5 Aug 2015 18:19:30 +0000 (18:19 +0000)]
am
4bd3b248: am
5082b180: am
ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev
* commit '
4bd3b248d520e6ddf28a135ff2cc806550578c41':
Remove EXTRA_CALL_HISTORY_INFO.
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.
Svetoslav Ganov [Wed, 5 Aug 2015 18:02:28 +0000 (18:02 +0000)]
am
ac96d3a8: am
e7359b09: am
ef7deb90: am
e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
* commit '
ac96d3a8ca62a9386580f5efb1bcfe6894304d4b':
Fix app ops regressions introduced by the per UID policy change
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
Yusuke Sato [Wed, 5 Aug 2015 17:58:57 +0000 (17:58 +0000)]
am
a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
* commit '
a024acb8bab7e0e04f709fc9f927575f448e11db':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
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.
Mitchell Wills [Wed, 5 Aug 2015 17:55:11 +0000 (17:55 +0000)]
am
c439c236: am
bf026e68: am
b0e9e731: am
bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit '
c439c236f1f98e0ba0d4472b2422b078af03e782':
Fix incorrect default wifi power draw values
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
Yusuke Sato [Wed, 5 Aug 2015 17:46:18 +0000 (17:46 +0000)]
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
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
Rubin Xu [Wed, 5 Aug 2015 17:44:22 +0000 (17:44 +0000)]
am
c0ad5751: am
6b6b9cd9: am
01496367: am
ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit '
c0ad5751f895a1f76b8302b7fd068bd62a6058f3':
Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
Makoto Onuki [Wed, 5 Aug 2015 17:44:16 +0000 (17:44 +0000)]
am
ff1e7ad9: am
84c1eb6d: am
a29e0501: am
86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
* commit '
ff1e7ad9d0554c71966bc0391e27552c39f0a0b5':
READ_SMS allows getLine1Number() [1/3]
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
Niels Egberts [Wed, 5 Aug 2015 17:11:24 +0000 (17:11 +0000)]
am
3c204b61: am
8e4a16b8: am
a02bd53e: am
6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
* commit '
3c204b61759099cd51e08a5fbc460d03d383a1b1':
NPE occured when trying to parcel voice features.
Ian Pedowitz [Wed, 5 Aug 2015 17:11:18 +0000 (17:11 +0000)]
am
c3e4f31e: am
76b07705: am
4d2eec14: am
df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit '
c3e4f31e9ba64f92e3f06a9ce401211c1c058859':
Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""
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.