OSDN Git Service
Chenjie Luo [Mon, 7 Dec 2015 23:42:07 +0000 (23:42 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d am:
bef0525c38
am:
e4db3f0757
* commit '
e4db3f0757fccdf26d98ab4295ac4828a479e8eb':
Check NPE beforehand instead of catching it at runtime
Samuel Tan [Mon, 7 Dec 2015 23:38:14 +0000 (23:38 +0000)]
Merge "Add support for reading and writing double array values" am:
61c0b7cd4d
am:
ff8ef28e73
* commit '
ff8ef28e73c0959a4993fea975d0bdefbc27a20b':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:35:20 +0000 (23:35 +0000)]
Merge "Switch to the latest version of Caliper" am:
ae119af517
am:
5e2d958157
* commit '
5e2d958157d8043d5a7aca1263af2186fdf17e6c':
Switch to the latest version of Caliper
Amit Mahajan [Mon, 7 Dec 2015 23:32:22 +0000 (23:32 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am:
cd2cc9aa9b
am:
d515b124f7
* commit '
d515b124f7f966a3e4725dc6f6179ade869df636':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:30:22 +0000 (23:30 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev am:
dde5a6ef28
am:
5ff55cec79
* commit '
5ff55cec79b7bda67dd3e458263ccb8e2896af30':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:28:44 +0000 (23:28 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d
am:
bef0525c38
* commit '
bef0525c385c95f4ff6710ad9b117429a4d5ce63':
Check NPE beforehand instead of catching it at runtime
Samuel Tan [Mon, 7 Dec 2015 23:15:15 +0000 (23:15 +0000)]
Merge "Add support for reading and writing double array values"
am:
61c0b7cd4d
* commit '
61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:12:48 +0000 (23:12 +0000)]
Merge "Switch to the latest version of Caliper"
am:
ae119af517
* commit '
ae119af517fc427ead5bd6a3394b3b1f92df790d':
Switch to the latest version of Caliper
Amit Mahajan [Mon, 7 Dec 2015 23:10:55 +0000 (23:10 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
am:
cd2cc9aa9b
* commit '
cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:08:01 +0000 (23:08 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
am:
dde5a6ef28
* commit '
dde5a6ef2846bfb6b253b0946a7b9e42a11b8348':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:06:36 +0000 (23:06 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
am:
e56f7b0d1d
* commit '
e56f7b0d1d92390c3409999ea841525514163f65':
Check NPE beforehand instead of catching it at runtime
Chenjie Luo [Mon, 7 Dec 2015 21:04:14 +0000 (21:04 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
Samuel Tan [Mon, 7 Dec 2015 18:56:01 +0000 (18:56 +0000)]
Merge "Add support for reading and writing double array values"
Amit Mahajan [Mon, 7 Dec 2015 18:15:38 +0000 (18:15 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
Julia Reynolds [Mon, 7 Dec 2015 15:06:03 +0000 (15:06 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
Julia Reynolds [Thu, 5 Nov 2015 16:08:02 +0000 (11:08 -0500)]
Fix radio button flash on hour change.
Also delete confusing debug variable.
Bug:
25459795
Bug:
25783349
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
Paul Duffin [Mon, 7 Dec 2015 13:34:27 +0000 (13:34 +0000)]
Merge "Switch to the latest version of Caliper"
Paul Duffin [Tue, 1 Dec 2015 15:41:36 +0000 (15:41 +0000)]
Switch to the latest version of Caliper
Added an Android.mk file to core/tests/benchmarks to build the
benchmarks against caliper-api-target to ensure that they build
correctly. Changed the implementations to work with the new
version of Caliper.
Bug:
24848946
Change-Id: Ib28026816dbc5c1d54f65974f4a1abfee299c43f
Elliott Hughes [Sat, 5 Dec 2015 01:44:41 +0000 (01:44 +0000)]
Merge "Track rename from base/ to android-base/." am:
9f6a2ae67c
am:
8aa8fe2c64
* commit '
8aa8fe2c64cf4611ba68d90992e54858a35aae58':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:36:53 +0000 (01:36 +0000)]
Merge "Track rename from base/ to android-base/."
am:
9f6a2ae67c
* commit '
9f6a2ae67c70085d550962829e6bfe76706907d8':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:30:46 +0000 (01:30 +0000)]
Merge "Track rename from base/ to android-base/."
Eino-Ville Talvala [Sat, 5 Dec 2015 00:36:06 +0000 (16:36 -0800)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41 am:
7417f70ac6 am:
e2d516fd4b
am:
5794dbb1a5
* commit '
5794dbb1a5f54b116911526c1086efda5dfb63f7':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:28:38 +0000 (00:28 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41 am:
7417f70ac6
am:
e2d516fd4b
* commit '
e2d516fd4b77352919d1c40971678909e3f4a15d':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:20:47 +0000 (16:20 -0800)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41
am:
7417f70ac6
* commit '
7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:11:43 +0000 (00:11 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d
am:
add4b91d41
* commit '
add4b91d41d3ba810b6b25c14d7c13050394f201':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:03:23 +0000 (16:03 -0800)]
Merge "Camera: codegen doc update" into mnc-dev
am:
69c5e7143d
* commit '
69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
Camera: codegen doc update
Eino-Ville Talvala [Fri, 4 Dec 2015 23:54:05 +0000 (23:54 +0000)]
Merge "Camera: codegen doc update" into mnc-dev
Elliott Hughes [Fri, 4 Dec 2015 23:33:35 +0000 (15:33 -0800)]
Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
Phil Burk [Fri, 4 Dec 2015 01:27:36 +0000 (01:27 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections." am:
1c9bdfd029
am:
ec719f1509
* commit '
ec719f1509807765dac661286000c7e411ec9662':
USB MIDI: Fix race condition that causes intermittent connections.
Phil Burk [Fri, 4 Dec 2015 01:18:51 +0000 (01:18 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
am:
1c9bdfd029
* commit '
1c9bdfd0294cd1b13470ae6443bfa2ad425bd7dd':
USB MIDI: Fix race condition that causes intermittent connections.
Phil Burk [Fri, 4 Dec 2015 01:12:01 +0000 (01:12 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
Phil Burk [Fri, 4 Dec 2015 01:00:42 +0000 (17:00 -0800)]
USB MIDI: Fix race condition that causes intermittent connections.
Plugging in a USB MIDI device normally works.
But occasionally the device is not seen due to a race condition.
This code retries until the device is ready.
Change-Id: Ifba9c9678e6be0c3d139f3467f895307096a2ad8
Signed-off-by: Phil Burk <philburk@google.com>
Jeff Sharkey [Thu, 3 Dec 2015 23:19:42 +0000 (23:19 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI" am:
f1b325c1ec
am:
f2a3c341ab
* commit '
f2a3c341ab9061b576ab399e1336e9e45afb8c2e':
Allow customisation of advanced settings in DocumentsUI
Jeff Sharkey [Thu, 3 Dec 2015 23:11:51 +0000 (23:11 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
am:
f1b325c1ec
* commit '
f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
Allow customisation of advanced settings in DocumentsUI
Jeff Sharkey [Thu, 3 Dec 2015 23:04:29 +0000 (23:04 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
Edward Savage-Jones [Tue, 21 Jan 2014 14:45:44 +0000 (15:45 +0100)]
Allow customisation of advanced settings in DocumentsUI
Enables the customisation of the default value of the DocumentsUI
'advanced' setting using overlays.
Change-Id: I240cbb845d15ab2ea6ae7a79a17b4f51905fdb9c
Chenjie Luo [Thu, 3 Dec 2015 20:24:12 +0000 (12:24 -0800)]
Check NPE beforehand instead of catching it at runtime
This will fix the page fault when watch rings during incoming call
Bug:
25904666
Change-Id: Ia7e6db0628108dbf298e3811a846534ba69c0b46
Vineeta Srivastava [Thu, 3 Dec 2015 22:09:58 +0000 (22:09 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev am:
9eacc97d71
am:
360930372f
* commit '
360930372fcab1a093bd1cd7d11bd082255577d8':
Set Tether APN protocol type to IPv4 for Telus
Vineeta Srivastava [Thu, 3 Dec 2015 22:01:30 +0000 (22:01 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
am:
9eacc97d71
* commit '
9eacc97d71166a05ec0eb67025a00cb4e57979c8':
Set Tether APN protocol type to IPv4 for Telus
Vineeta Srivastava [Thu, 3 Dec 2015 21:56:29 +0000 (21:56 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
Hyejin Kim [Fri, 30 Oct 2015 00:46:53 +0000 (09:46 +0900)]
Set Tether APN protocol type to IPv4 for Telus
BUG=
25356170
Change-Id: I080c354409d263388844543bf7a57ff6c28d760f
Alex Klyubin [Thu, 3 Dec 2015 21:26:05 +0000 (21:26 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests." am:
59c9bfd41b
am:
b1e7f6d287
* commit '
b1e7f6d2870ca59f582671bdacf78efc52028bbc':
Stop using 512 bit RSA keys in keyset unit tests.
Alex Klyubin [Thu, 3 Dec 2015 21:18:38 +0000 (21:18 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
am:
59c9bfd41b
* commit '
59c9bfd41bfe7d897a1a5d2e35d8dd48322c9865':
Stop using 512 bit RSA keys in keyset unit tests.
Alex Klyubin [Thu, 3 Dec 2015 21:10:46 +0000 (21:10 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
Christine Hallstrom [Thu, 3 Dec 2015 20:52:44 +0000 (20:52 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472 am:
67d068b5ec
am:
9355a0420e
* commit '
9355a0420e3324ae42ac1a5ca108730c5990dcbf':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Alex Klyubin [Thu, 3 Dec 2015 20:52:23 +0000 (12:52 -0800)]
Stop using 512 bit RSA keys in keyset unit tests.
This switches keyset unit tests from two unrealistically short 512 bit
RSA keys to a more realistic 2048 bit RSA key and a NIST P-256 EC key.
Change-Id: If615b97dff22a2a4f7f0e6015e410e98b8d395cd
Christine Hallstrom [Thu, 3 Dec 2015 20:42:35 +0000 (20:42 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472
am:
67d068b5ec
* commit '
67d068b5ec7ca3739047f0c5a162f9317171f784':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:35:39 +0000 (20:35 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
am:
7fb263c472
* commit '
7fb263c472c9df98410b2b9dfe72e093e2d594e0':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
Andy Hung [Thu, 3 Dec 2015 19:55:32 +0000 (19:55 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb am:
a30685ef8d
am:
ae4b789619
* commit '
ae4b7896195727dfd8d00b90f25074206bf21775':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:50:25 +0000 (19:50 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb
am:
a30685ef8d
* commit '
a30685ef8dcaa18b2561c17cfbbb48044adb2d27':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:42:45 +0000 (19:42 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7
am:
94cefd6adb
* commit '
94cefd6adb7cf464e4765faaba001071b543517b':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:34:01 +0000 (19:34 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c
am:
7c798c13a7
* commit '
7c798c13a7c36f3c8877f410ecf5552e1b385805':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:24:02 +0000 (19:24 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
am:
0a887bcd5c
* commit '
0a887bcd5c5a8056735d221ad71afcff1f6eb1a6':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Yohei Yukawa [Thu, 3 Dec 2015 19:18:45 +0000 (19:18 +0000)]
Merge "Fix special handling of a fake language code "tl"." am:
9fd2af6b32
am:
30e321b54a
* commit '
30e321b54a589d33dc7f2dd7344bef95faaaf83d':
Fix special handling of a fake language code "tl".
Yohei Yukawa [Thu, 3 Dec 2015 19:10:30 +0000 (19:10 +0000)]
Merge "Fix special handling of a fake language code "tl"."
am:
9fd2af6b32
* commit '
9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
Fix special handling of a fake language code "tl".
Christine Hallstrom [Tue, 17 Nov 2015 20:24:07 +0000 (12:24 -0800)]
Log API calls to createBond(), cancelBondProcess(), removeBond()
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.
Bug:
25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
Yohei Yukawa [Thu, 3 Dec 2015 19:04:24 +0000 (19:04 +0000)]
Merge "Fix special handling of a fake language code "tl"."
Christopher Wiley [Thu, 3 Dec 2015 17:54:08 +0000 (17:54 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am:
0ded0da517
am:
4ff2cc0898
* commit '
4ff2cc0898891488dce3917d105f15264b7742ce':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am:
0ded0da517
* commit '
0ded0da51743a24707bece4b0be05f49db3b9981':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:43:43 +0000 (17:43 +0000)]
Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException"
Jeff Sharkey [Thu, 3 Dec 2015 17:16:30 +0000 (17:16 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider" am:
e8651aed4b
am:
aae0a49c16
* commit '
aae0a49c164e9eeb19d46967c84697cd1a3a6783':
Avoid a double decrease of reference counter for unstable provider
Jeff Sharkey [Thu, 3 Dec 2015 17:15:06 +0000 (17:15 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
am:
67003be3f8
* commit '
67003be3f8a53c1d11d130d53d866255bd04d2c7':
Jeff Sharkey [Thu, 3 Dec 2015 17:14:11 +0000 (17:14 +0000)]
Merge branch 'mnc-dr2-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp
Jeff Sharkey [Thu, 3 Dec 2015 17:13:43 +0000 (17:13 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am:
29e0b6e789
am:
af588a31bc
* commit '
af588a31bc62b791014b3cc4e655107e9446e3d0':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:12:41 +0000 (17:12 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am:
29e0b6e789
am:
af588a31bc
* commit '
af588a31bc62b791014b3cc4e655107e9446e3d0':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:11:22 +0000 (17:11 +0000)]
Merge "Fix race condition when collecting op callback." am:
98844a97d2
am:
678011854b
* commit '
678011854b0969f5fe69d597911beabcadcb03e8':
Fix race condition when collecting op callback.
Jeff Sharkey [Thu, 3 Dec 2015 17:09:59 +0000 (17:09 +0000)]
Merge "Improved variable naming" am:
4ef9d41066
am:
bc57510e9f
* commit '
bc57510e9f359929a55130d8a35c61a84dad4568':
Improved variable naming
Jeff Sharkey [Thu, 3 Dec 2015 17:07:50 +0000 (17:07 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider"
am:
e8651aed4b
* commit '
e8651aed4b8a2c6703589069e26f5be750b2a947':
Avoid a double decrease of reference counter for unstable provider
Jeff Sharkey [Thu, 3 Dec 2015 17:06:57 +0000 (17:06 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Jeff Sharkey [Thu, 3 Dec 2015 17:06:24 +0000 (17:06 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:05:16 +0000 (17:05 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:03:53 +0000 (17:03 +0000)]
Merge "Fix race condition when collecting op callback."
am:
98844a97d2
* commit '
98844a97d2bd07146854783374ee3a19aed8edd5':
Fix race condition when collecting op callback.
Jeff Sharkey [Thu, 3 Dec 2015 17:02:21 +0000 (17:02 +0000)]
Merge "Improved variable naming"
am:
4ef9d41066
* commit '
4ef9d41066d8b4124c2c59752512adf24102634d':
Improved variable naming
Jeff Sharkey [Thu, 3 Dec 2015 16:59:58 +0000 (16:59 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider"
Jeff Sharkey [Thu, 3 Dec 2015 16:59:13 +0000 (16:59 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
Jeff Sharkey [Thu, 3 Dec 2015 16:58:34 +0000 (16:58 +0000)]
Merge "Fix race condition when collecting op callback."
Jeff Sharkey [Thu, 3 Dec 2015 16:58:03 +0000 (16:58 +0000)]
Merge "Improved variable naming"
Yohei Yukawa [Thu, 3 Dec 2015 02:22:41 +0000 (18:22 -0800)]
Fix special handling of a fake language code "tl".
My previous CL
92280cd309b0f5967dd253280962d8581844db89 [1] had a silly
mistake that "tl" is converted to "fil" but "tl_PH" is not.
[1] I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
With this CL, the compatibility rewrite-rule from "tl" to "fil" starts
working regardless of the existence of countly/variant subtags in locale
string. So far the only affected platfrom is API Level 23.
Bug:
20696126
Change-Id: Ica9cd2baac002c406f92331aadd7725d7424046a
Colin Cross [Thu, 3 Dec 2015 01:28:09 +0000 (01:28 +0000)]
Merge "Don\'t hardcode expected path to mainDexClasses" am:
be1613379e
am:
38400b4696
* commit '
38400b4696111d88b4fadb1fe99bdd05e40ba6be':
Don't hardcode expected path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 01:19:28 +0000 (01:19 +0000)]
Merge "Don\'t hardcode expected path to mainDexClasses"
am:
be1613379e
* commit '
be1613379e4814e9c54901d6e0171841e68f60ab':
Don't hardcode expected path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 01:12:05 +0000 (01:12 +0000)]
Merge "Don't hardcode expected path to mainDexClasses"
Colin Cross [Thu, 3 Dec 2015 00:24:08 +0000 (16:24 -0800)]
Don't hardcode expected path to mainDexClasses
Use MAINDEXCLASSES defined by the build system instead of manually using
$(HOST_OUT_EXECUTABLES)/mainDexClasses.
Change-Id: Iede13c243ef0c4e374c8e80bab4a995cea76b9b1
Andy Hung [Tue, 1 Dec 2015 00:09:55 +0000 (16:09 -0800)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.
Bug:
25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit
0275a982abecee683f16c827d405eafe51fb67ae)
Chris Elliott [Wed, 2 Dec 2015 22:46:11 +0000 (22:46 +0000)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am:
8e79dae3f6
am:
087d30c142
* commit '
087d30c14243f38c28793877b8e5ad12d3a2b269':
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
Chris Elliott [Wed, 2 Dec 2015 21:57:06 +0000 (21:57 +0000)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
am:
8e79dae3f6
* commit '
8e79dae3f67aae032010ddbbef2f8032ace01263':
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
Chris Elliott [Wed, 2 Dec 2015 21:16:46 +0000 (13:16 -0800)]
DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."
This reverts commit
f60491183def4c46b4026afb4648544e7289ea5f.
Robin Lee [Wed, 2 Dec 2015 12:47:59 +0000 (12:47 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" am:
3fe5a65b1c
am:
427edbce96
* commit '
427edbce965f62707a2a43d86d70d9d19f6c60dc':
DevicePolicy: Always send ACTION_PASSWORD_CHANGED
Robin Lee [Wed, 2 Dec 2015 12:41:20 +0000 (12:41 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
am:
3fe5a65b1c
* commit '
3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6':
DevicePolicy: Always send ACTION_PASSWORD_CHANGED
Robin Lee [Wed, 2 Dec 2015 12:35:14 +0000 (12:35 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
Adrian Roos [Wed, 2 Dec 2015 01:50:10 +0000 (01:50 +0000)]
Merge "Charging speed based on voltage" into mnc-dr2-dev
am:
0ede75507c
* commit '
0ede75507c43819d0417efe1f1ab5c626a608fc5':
Charging speed based on voltage
Adrian Roos [Wed, 2 Dec 2015 01:44:21 +0000 (01:44 +0000)]
Merge "Charging speed based on voltage" into mnc-dr2-dev
Ben Fennema [Wed, 2 Dec 2015 01:27:25 +0000 (01:27 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am:
4d70e6a3c0 -s ours am:
8780f07b5c -s ours
am:
ceec3dab7c -s ours
* commit '
ceec3dab7cb7fcee6d367382fae11c9855263474':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:20:15 +0000 (01:20 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am:
4d70e6a3c0 -s ours
am:
8780f07b5c -s ours
* commit '
8780f07b5c2a318cb28c172f9eac47b975793c90':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:12:04 +0000 (01:12 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev
am:
4d70e6a3c0 -s ours
* commit '
4d70e6a3c044c4e29d84835a026b3e70b44b66e8':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:06:12 +0000 (01:06 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev
Ben Fennema [Wed, 2 Dec 2015 01:05:25 +0000 (01:05 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
This reverts commit
ad75169628589a275fb869a813ea697336e0c0aa.
Change-Id: Ic2f003fc200c077391d18bef9d5b79a98601769c
Ben Fennema [Wed, 2 Dec 2015 00:41:56 +0000 (00:41 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am:
ec7180f733 -s ours am:
b98383291f -s ours
am:
e90efd9153 -s ours
* commit '
e90efd91536b5bf7904336f78f258d63ba2cc904':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Ben Fennema [Wed, 2 Dec 2015 00:34:14 +0000 (00:34 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am:
ec7180f733 -s ours
am:
b98383291f -s ours
* commit '
b98383291f32d0152cb291855aa00f016d526a4a':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Ben Fennema [Wed, 2 Dec 2015 00:26:19 +0000 (00:26 +0000)]
Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev
am:
ec7180f733 -s ours
* commit '
ec7180f7333777582e642fc54f7106d500b7da33':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
OSDN Git Service
