OSDN Git Service
Yusuke Sato [Thu, 25 Jun 2015 16:09:03 +0000 (16:09 +0000)]
Merge "Initialize NativeLibraryHelper.Handle with |pkg|"
Igor Viarheichyk [Thu, 25 Jun 2015 15:21:42 +0000 (15:21 +0000)]
am
37bdeb3e: am
62fdc0cf: am
729ffa29: ICU format support for pseudolocalizes.
* commit '
37bdeb3e8091207ef3e2c26cc30b6384bfa99e8a':
ICU format support for pseudolocalizes.
Igor Viarheichyk [Thu, 25 Jun 2015 15:12:35 +0000 (15:12 +0000)]
am
62fdc0cf: am
729ffa29: ICU format support for pseudolocalizes.
* commit '
62fdc0cffe7f947d45ade5cbc3c0086b9af88be5':
ICU format support for pseudolocalizes.
Narayan Kamath [Thu, 25 Jun 2015 10:12:48 +0000 (10:12 +0000)]
am
cd1cdb46: am
9d01914a: am
fdb70dc4: Merge "Fix filedescriptor leakage in MediaMetadataRetriever"
* commit '
cd1cdb4653c80ab8be92e6bc03d6dd7c2299655d':
Fix filedescriptor leakage in MediaMetadataRetriever
Narayan Kamath [Thu, 25 Jun 2015 10:12:41 +0000 (10:12 +0000)]
am
c279a835: am
37c68894: am
a78c0e0b: Merge "Fixed Javadoc typos"
* commit '
c279a835d5dcb16ac5b4b5311940de5b4fbd72aa':
Fixed Javadoc typos
Narayan Kamath [Thu, 25 Jun 2015 10:02:15 +0000 (10:02 +0000)]
am
9d01914a: am
fdb70dc4: Merge "Fix filedescriptor leakage in MediaMetadataRetriever"
* commit '
9d01914a89bc693e21809fabf46281e638b93f85':
Fix filedescriptor leakage in MediaMetadataRetriever
Narayan Kamath [Thu, 25 Jun 2015 10:02:08 +0000 (10:02 +0000)]
am
37c68894: am
a78c0e0b: Merge "Fixed Javadoc typos"
* commit '
37c688948d4464d636cd64c537b98697cb4b795d':
Fixed Javadoc typos
Narayan Kamath [Thu, 25 Jun 2015 09:48:46 +0000 (09:48 +0000)]
am
fdb70dc4: Merge "Fix filedescriptor leakage in MediaMetadataRetriever"
* commit '
fdb70dc4346f801673aa700f3fca2b8cc77b809c':
Fix filedescriptor leakage in MediaMetadataRetriever
Narayan Kamath [Thu, 25 Jun 2015 09:48:39 +0000 (09:48 +0000)]
am
a78c0e0b: Merge "Fixed Javadoc typos"
* commit '
a78c0e0b9aff70d03101a25b47024f6d02cb93e2':
Fixed Javadoc typos
Igor Viarheichyk [Thu, 25 Jun 2015 09:46:17 +0000 (09:46 +0000)]
am
729ffa29: ICU format support for pseudolocalizes.
* commit '
729ffa299ca786eb21ba8330096b33c7bcd66fbf':
ICU format support for pseudolocalizes.
Igor Viarheichyk [Fri, 15 May 2015 01:47:00 +0000 (18:47 -0700)]
ICU format support for pseudolocalizes.
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.
(cherry picked from commit
cbb1e676b56677ae3585c067f29646dddffb4857)
bug:
22060509
Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
Narayan Kamath [Thu, 25 Jun 2015 08:33:49 +0000 (08:33 +0000)]
Merge "Fix filedescriptor leakage in MediaMetadataRetriever"
harvey_tsai [Thu, 11 Jun 2015 03:51:36 +0000 (11:51 +0800)]
Fix filedescriptor leakage in MediaMetadataRetriever
setDataSource(String) throws an IllegalArgumentException
when an IOException or FileNotFoundException occurs, but doesn't
close FileDescriptor accordingly.
Change-Id: Ib6e0f1418afeeb19e03abd4bedb4cc845a58b6b4
Narayan Kamath [Thu, 25 Jun 2015 08:27:47 +0000 (08:27 +0000)]
Merge "Fixed Javadoc typos"
Philipp Hasper [Tue, 12 May 2015 07:09:25 +0000 (09:09 +0200)]
Fixed Javadoc typos
Simple single character typos
Change-Id: I17660dbb3b7ee6597637e8d76770f434ebf202ea
Erik Kline [Thu, 25 Jun 2015 05:35:55 +0000 (05:35 +0000)]
am
00d28aee: am
2800c9fd: am
e42441a2: Merge "Don\'t lose critical success/failure messages" into mnc-dev
* commit '
00d28aee898cf50530b61d099228745f674fa8da':
Don't lose critical success/failure messages
Svetoslav [Thu, 25 Jun 2015 05:35:48 +0000 (05:35 +0000)]
am
de34c214: am
dbfa7a1f: am
57f2dac7: Merge "iUpdate the sensor group description" into mnc-dev
* commit '
de34c2149b93b8b760b2f4858e7336083bccbdf9':
iUpdate the sensor group description
Erik Kline [Thu, 25 Jun 2015 05:20:46 +0000 (05:20 +0000)]
am
2800c9fd: am
e42441a2: Merge "Don\'t lose critical success/failure messages" into mnc-dev
* commit '
2800c9fd8201a9f04578c82cfeb223f2161065c3':
Don't lose critical success/failure messages
Svetoslav [Thu, 25 Jun 2015 05:20:40 +0000 (05:20 +0000)]
am
dbfa7a1f: am
57f2dac7: Merge "iUpdate the sensor group description" into mnc-dev
* commit '
dbfa7a1f7720e0581c7028aa06cc3ad7d41de71f':
iUpdate the sensor group description
Andreas Gampe [Thu, 25 Jun 2015 05:14:05 +0000 (05:14 +0000)]
am
de893af9: am
d2b65b2b: am
08592bd0: Merge "Frameworks/base: Add tracing system properties"
* commit '
de893af974dbc95dcbe2da5c56ed1a718f21729a':
Frameworks/base: Add tracing system properties
Erik Kline [Thu, 25 Jun 2015 05:08:52 +0000 (05:08 +0000)]
am
e42441a2: Merge "Don\'t lose critical success/failure messages" into mnc-dev
* commit '
e42441a232ae1a75cdd2541f974ed8da258b97cd':
Don't lose critical success/failure messages
Svetoslav [Thu, 25 Jun 2015 05:08:38 +0000 (05:08 +0000)]
am
57f2dac7: Merge "iUpdate the sensor group description" into mnc-dev
* commit '
57f2dac721e01ad92843511b142cfc5ed738dda9':
iUpdate the sensor group description
Ficus Kirkpatrick [Thu, 25 Jun 2015 04:43:30 +0000 (04:43 +0000)]
Merge "Update required API level in the Volley docs."
Andreas Gampe [Thu, 25 Jun 2015 04:27:34 +0000 (04:27 +0000)]
am
d2b65b2b: am
08592bd0: Merge "Frameworks/base: Add tracing system properties"
* commit '
d2b65b2bfb3fdf796e50fa345edeccc47b313da9':
Frameworks/base: Add tracing system properties
Andreas Gampe [Thu, 25 Jun 2015 03:53:59 +0000 (03:53 +0000)]
am
08592bd0: Merge "Frameworks/base: Add tracing system properties"
* commit '
08592bd0f7daf5c1d10baf78d5e216befd7b6a8e':
Frameworks/base: Add tracing system properties
Erik Kline [Thu, 25 Jun 2015 03:46:33 +0000 (03:46 +0000)]
Merge "Don't lose critical success/failure messages" into mnc-dev
Andreas Gampe [Thu, 25 Jun 2015 03:44:43 +0000 (03:44 +0000)]
Merge "Frameworks/base: Add tracing system properties"
Svetoslav [Thu, 25 Jun 2015 02:14:53 +0000 (02:14 +0000)]
Merge "iUpdate the sensor group description" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 02:12:28 +0000 (19:12 -0700)]
iUpdate the sensor group description
bug:
21784262
Change-Id: I417e2170b8a977b274ca0f6b2364c670bbb5264a
Anthony Hugh [Thu, 25 Jun 2015 02:09:46 +0000 (02:09 +0000)]
am
2452dac8: (-s ours) am
0a6df3f6: am
2e2d030b: am
a50fa710: (-s ours) am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
2452dac8690a88983fb54c48f0e52660ef2a97c1':
DO NOT MERGE: Introduce stem keycodes for Wear
Alex Klyubin [Thu, 25 Jun 2015 02:09:39 +0000 (02:09 +0000)]
am
b9ea6372: am
8c7ffbff: am
656fd493: Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev
* commit '
b9ea6372c39091d24b57ce2d360b1d4bc91c0ce8':
Make NONEwithECDSA truncate input when necessary.
Andreas Gampe [Thu, 25 Jun 2015 02:09:33 +0000 (02:09 +0000)]
am
e7df463c: am
51fe757e: am
8f7ae66e: Merge "Frameworks/base: Add tracing system properties" into mnc-dev
* commit '
e7df463c0074d4bc85c43cd19a7417304cb8ca28':
Frameworks/base: Add tracing system properties
Anthony Hugh [Thu, 25 Jun 2015 01:58:31 +0000 (01:58 +0000)]
am
0a6df3f6: am
2e2d030b: am
a50fa710: (-s ours) am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
0a6df3f6e17a9ff166fb8e892cf5381173535f3e':
DO NOT MERGE: Introduce stem keycodes for Wear
Alex Klyubin [Thu, 25 Jun 2015 01:58:26 +0000 (01:58 +0000)]
am
8c7ffbff: am
656fd493: Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev
* commit '
8c7ffbffaa7d0879208301038c5fd49b4a43fc91':
Make NONEwithECDSA truncate input when necessary.
Andreas Gampe [Thu, 25 Jun 2015 01:58:21 +0000 (01:58 +0000)]
am
51fe757e: am
8f7ae66e: Merge "Frameworks/base: Add tracing system properties" into mnc-dev
* commit '
51fe757ef106b65218c04be8d73333b959fae545':
Frameworks/base: Add tracing system properties
Dave Langemak [Thu, 25 Jun 2015 01:58:09 +0000 (01:58 +0000)]
am
b1b5117f: am
63b59d3f: am
ecff75a1: Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev
* commit '
b1b5117f9cb602a7579c91e130ba7252cd60cc5b':
Revert "Throw IAE on invalid measure spec size"
Ficus Kirkpatrick [Thu, 25 Jun 2015 01:53:58 +0000 (18:53 -0700)]
Update required API level in the Volley docs.
They said you needed API 4+, but it's actually 8+ (Froyo)
Dave Langemak [Thu, 25 Jun 2015 01:44:32 +0000 (01:44 +0000)]
am
63b59d3f: am
ecff75a1: Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev
* commit '
63b59d3fd814224e6b17a81ab23bc706492f75e6':
Revert "Throw IAE on invalid measure spec size"
Andreas Gampe [Tue, 23 Jun 2015 04:09:36 +0000 (21:09 -0700)]
Frameworks/base: Add tracing system properties
Add system properties to support zygote-started method tracing.
These are needed as the limit on system properties does not allow
the reuse of the runtime extra options system property.
Bug:
21760614
(cherry picked from commit
98f406f6f31660d0f5ee32113ffadc720b426dc6)
Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
Anthony Hugh [Thu, 25 Jun 2015 01:43:46 +0000 (01:43 +0000)]
am
2e2d030b: am
a50fa710: (-s ours) am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
2e2d030bfe3b7ba0f2c2f26e70253494eb94cc1e':
DO NOT MERGE: Introduce stem keycodes for Wear
Alex Klyubin [Thu, 25 Jun 2015 01:43:42 +0000 (01:43 +0000)]
am
656fd493: Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev
* commit '
656fd49386ddd55e0dfe19ae7287413af7fff295':
Make NONEwithECDSA truncate input when necessary.
Andreas Gampe [Thu, 25 Jun 2015 01:43:38 +0000 (01:43 +0000)]
am
8f7ae66e: Merge "Frameworks/base: Add tracing system properties" into mnc-dev
* commit '
8f7ae66e47181ee87985da63d8aa6ef0cad20ab2':
Frameworks/base: Add tracing system properties
Anthony Hugh [Thu, 25 Jun 2015 01:37:28 +0000 (01:37 +0000)]
am
a50fa710: (-s ours) am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
a50fa71044f759013dc506ae3dc5fce11e67494e':
DO NOT MERGE: Introduce stem keycodes for Wear
Alex Klyubin [Thu, 25 Jun 2015 01:31:17 +0000 (01:31 +0000)]
Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev
Dave Langemak [Thu, 25 Jun 2015 01:30:46 +0000 (01:30 +0000)]
am
ecff75a1: Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev
* commit '
ecff75a158db0514dc019eb3ec9b3f04c1a8f420':
Revert "Throw IAE on invalid measure spec size"
Andreas Gampe [Thu, 25 Jun 2015 01:29:36 +0000 (01:29 +0000)]
Merge "Frameworks/base: Add tracing system properties" into mnc-dev
Anthony Hugh [Thu, 25 Jun 2015 01:27:41 +0000 (01:27 +0000)]
am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
001df9ca900f3098222a4920a0048d2eb947bd4e':
DO NOT MERGE: Introduce stem keycodes for Wear
Alan Viverette [Thu, 25 Jun 2015 01:26:06 +0000 (01:26 +0000)]
am
1fd667a2: am
e6c01d05: am
c2a30713: Merge "Duplicate description on AccessibilityEvent"
* commit '
1fd667a2c8ad78933aac5f2bf2a6c6a63ac3bb37':
Duplicate description on AccessibilityEvent
Dave Langemak [Thu, 25 Jun 2015 01:17:57 +0000 (01:17 +0000)]
Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev
Dave Langemak [Thu, 25 Jun 2015 01:14:26 +0000 (01:14 +0000)]
Revert "Throw IAE on invalid measure spec size"
This reverts commit
ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7.
Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
Alan Viverette [Thu, 25 Jun 2015 01:12:27 +0000 (01:12 +0000)]
am
e6c01d05: am
c2a30713: Merge "Duplicate description on AccessibilityEvent"
* commit '
e6c01d05b4eb2de67bad60991cb2952fb34c3fea':
Duplicate description on AccessibilityEvent
Amith Yamasani [Thu, 25 Jun 2015 01:03:51 +0000 (01:03 +0000)]
am
7375fad1: am
02f604e9: am
3704da0d: Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
* commit '
7375fad1463ea85c762130d61aeed2eee096a6ba':
No need to check WRITE_SETTINGS permission in ContentProvider
Amith Yamasani [Thu, 25 Jun 2015 00:51:52 +0000 (00:51 +0000)]
am
02f604e9: am
3704da0d: Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
* commit '
02f604e9428682859a476206379c9f45711330a5':
No need to check WRITE_SETTINGS permission in ContentProvider
Alan Viverette [Thu, 25 Jun 2015 00:48:31 +0000 (00:48 +0000)]
am
a54e2886: am
1983fdca: am
10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
* commit '
a54e28865a3a7ce14a09d1e0e8dd16e56be32f18':
Avoid negative childSpecSize in RelativeLayout
Adam Powell [Thu, 25 Jun 2015 00:48:26 +0000 (00:48 +0000)]
am
bf7cccdc: am
a5e4db2e: am
91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
* commit '
bf7cccdca1dfe43a9e1956c707615dad2271e6fd':
Fix ChooserActivity check for still-alive ChooserTargets
Amith Yamasani [Thu, 25 Jun 2015 00:38:09 +0000 (00:38 +0000)]
am
3704da0d: Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
* commit '
3704da0d9e45605e0ff38408a30de38b672ff83e':
No need to check WRITE_SETTINGS permission in ContentProvider
ztenghui [Thu, 25 Jun 2015 00:33:23 +0000 (00:33 +0000)]
am
3225c7ae: am
6c270c57: am
93666e86: Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
* commit '
3225c7ae6e1eaf8145c6e7602c378b00d1f76db3':
Resize the VectorDrawable according to the virtual Dpi
Alan Viverette [Thu, 25 Jun 2015 00:32:42 +0000 (00:32 +0000)]
am
983b862b: am
1143cca3: am
6acb521f: Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
* commit '
983b862be84b823797d5f66b1e35bc364a7ce95d':
Update local state when creating LayerDrawable from constant state
Junda Liu [Thu, 25 Jun 2015 00:32:36 +0000 (00:32 +0000)]
am
34c73142: am
624704ba: am
e5c7ca7d: Rename and add carrier config keys for volte and ims.
* commit '
34c73142cc51f064c7ddae3b1b648db3742c995c':
Rename and add carrier config keys for volte and ims.
Tim Murray [Thu, 25 Jun 2015 00:32:22 +0000 (00:32 +0000)]
am
b9d00da0: am
c88dff63: am
948c6ecc: Merge "add cpuset support" into mnc-dev
* commit '
b9d00da051cb647142b2f37bb1852a2d765ecdea':
add cpuset support
Alan Viverette [Thu, 25 Jun 2015 00:31:43 +0000 (00:31 +0000)]
am
1983fdca: am
10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
* commit '
1983fdca61eecfd964cc8b7842e2b19806fd4d1c':
Avoid negative childSpecSize in RelativeLayout
Adam Powell [Thu, 25 Jun 2015 00:31:37 +0000 (00:31 +0000)]
am
a5e4db2e: am
91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
* commit '
a5e4db2e9025254b80f6c0c380d355e5e0f8234a':
Fix ChooserActivity check for still-alive ChooserTargets
Man Cao [Thu, 25 Jun 2015 00:28:01 +0000 (17:28 -0700)]
resolved conflicts for merge of
8fb82074 to master
Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb
Amith Yamasani [Thu, 25 Jun 2015 00:24:18 +0000 (00:24 +0000)]
Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:17:58 +0000 (00:17 +0000)]
am
10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
* commit '
10bf27e2c90f05a8acad3cf902a9bf3ab8dbcca3':
Avoid negative childSpecSize in RelativeLayout
Adam Powell [Thu, 25 Jun 2015 00:17:54 +0000 (00:17 +0000)]
am
91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
* commit '
91feb107f2c7b51bf3cbdef43bea2fb61b56a8ee':
Fix ChooserActivity check for still-alive ChooserTargets
Alan Viverette [Thu, 25 Jun 2015 00:09:05 +0000 (00:09 +0000)]
Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
Adam Powell [Thu, 25 Jun 2015 00:08:52 +0000 (00:08 +0000)]
Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:03:48 +0000 (17:03 -0700)]
Avoid negative childSpecSize in RelativeLayout
Bug:
22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
ztenghui [Wed, 24 Jun 2015 23:59:29 +0000 (23:59 +0000)]
am
6c270c57: am
93666e86: Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
* commit '
6c270c573777e854ac333822ac7b30e8632e8082':
Resize the VectorDrawable according to the virtual Dpi
ztenghui [Wed, 24 Jun 2015 23:44:36 +0000 (23:44 +0000)]
am
93666e86: Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
* commit '
93666e8691c9b41855add5c1c92bfc9e0912764e':
Resize the VectorDrawable according to the virtual Dpi
Alan Viverette [Wed, 24 Jun 2015 23:37:37 +0000 (23:37 +0000)]
am
1143cca3: am
6acb521f: Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
* commit '
1143cca3007cf443a5ce0bf963fa2823fddae977':
Update local state when creating LayerDrawable from constant state
Junda Liu [Wed, 24 Jun 2015 23:37:32 +0000 (23:37 +0000)]
am
624704ba: am
e5c7ca7d: Rename and add carrier config keys for volte and ims.
* commit '
624704ba3de96d2095ca56f6e96134ac45d3999f':
Rename and add carrier config keys for volte and ims.
ztenghui [Wed, 24 Jun 2015 23:32:16 +0000 (23:32 +0000)]
Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
Alan Viverette [Wed, 24 Jun 2015 23:26:41 +0000 (23:26 +0000)]
am
6acb521f: Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
* commit '
6acb521f7c5d13b4f9891822db6121dcedce268a':
Update local state when creating LayerDrawable from constant state
Junda Liu [Wed, 24 Jun 2015 23:26:36 +0000 (23:26 +0000)]
am
e5c7ca7d: Rename and add carrier config keys for volte and ims.
* commit '
e5c7ca7d792f0ecb8219c217d756080d1d4c3933':
Rename and add carrier config keys for volte and ims.
Tim Murray [Wed, 24 Jun 2015 23:26:13 +0000 (23:26 +0000)]
am
c88dff63: am
948c6ecc: Merge "add cpuset support" into mnc-dev
* commit '
c88dff63e95de2fb9d8ba49093e5c3b7b211a136':
add cpuset support
Alan Viverette [Wed, 24 Jun 2015 23:15:14 +0000 (23:15 +0000)]
Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
Anthony Hugh [Tue, 23 Jun 2015 17:44:17 +0000 (10:44 -0700)]
DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG:
21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
Tim Murray [Wed, 24 Jun 2015 23:08:43 +0000 (23:08 +0000)]
am
948c6ecc: Merge "add cpuset support" into mnc-dev
* commit '
948c6ecc5a460ce78dc1d012ccb3efc844699985':
add cpuset support
Junda Liu [Wed, 24 Jun 2015 21:41:14 +0000 (14:41 -0700)]
Rename and add carrier config keys for volte and ims.
Bug: b/
21878236
Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
Alan Viverette [Wed, 24 Jun 2015 23:01:06 +0000 (23:01 +0000)]
am
c2a30713: Merge "Duplicate description on AccessibilityEvent"
* commit '
c2a30713793a60b7a1ab039da43f6510b06b0b7d':
Duplicate description on AccessibilityEvent
Yusuke Sato [Wed, 24 Jun 2015 22:59:06 +0000 (15:59 -0700)]
Initialize NativeLibraryHelper.Handle with |pkg|
to not parse the same apk file again in NativeLibraryHelper.
This will make derivePackageAbi() 2.5x faster. Previously,
derivePackageAbi() took ~330ms to process ~100 system packages
on volantis-userdebug. With this CL, it takes about ~130ms.
Bug:
22063656
Change-Id: I56d7af0ece3030247e2552c34a1007e79279988c
Tim Murray [Wed, 24 Jun 2015 22:59:51 +0000 (22:59 +0000)]
Merge "add cpuset support" into mnc-dev
Mathieu Chartier [Wed, 24 Jun 2015 22:59:18 +0000 (15:59 -0700)]
resolved conflicts for merge of
0f14548c to mnc-dev-plus-aosp
Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43
Selim Cinek [Wed, 24 Jun 2015 22:53:07 +0000 (22:53 +0000)]
am
43f6e345: am
117faced: am
1cc86956: Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev
* commit '
43f6e345ed28f697cec2ece73c6b46bf99482f55':
Fixed an inconsistency when booting up with SIMPIn
Selim Cinek [Wed, 24 Jun 2015 22:53:02 +0000 (22:53 +0000)]
am
2a029514: am
60b716ef: am
3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
* commit '
2a0295144ada058f94a744dcafd62ab8afda83d3':
Fixed a bug with encryption where the keyguard was never shown with PIN
Chris Wren [Wed, 24 Jun 2015 22:52:56 +0000 (22:52 +0000)]
am
4d97dbba: am
bb9114ff: am
749d66b8: Merge "remove setLatestEventInfo" into mnc-dev
* commit '
4d97dbba00d4f792c0236852d209071224e680ba':
remove setLatestEventInfo
Alan Viverette [Wed, 24 Jun 2015 22:47:01 +0000 (22:47 +0000)]
Merge "Duplicate description on AccessibilityEvent"
Amith Yamasani [Wed, 24 Jun 2015 22:46:09 +0000 (15:46 -0700)]
No need to check WRITE_SETTINGS permission in ContentProvider
Permission checks are enforced within the SettingsProvider specifically
for SECURE/SYSTEM/GLOBAL. Now WRITE_SETTINGS is runtime, so it shouldn't
apply to all the settings types.
Bug:
22044704
Change-Id: I9ed25d96b2fa4f46d3d049efa4300cd1d37bbd24
Alex Klyubin [Wed, 24 Jun 2015 19:25:52 +0000 (12:25 -0700)]
Make NONEwithECDSA truncate input when necessary.
Keymaster's implementation of ECDSA with digest NONE rejects input
longer than group size in bytes. RI's NONEwithECDSA accepts inputs
of arbitrary length by truncating them to the above size. This CL
makes Android Keystore's NONEwithECDSA do the truncation to keep
the JCA and Keymaster happy.
The change is inside AndroidKeyStoreECDSASignatureSpi$NONE. All other
small modifications are for supporting that change by making it
possible for AndroidKeyStoreSignatureSpiBase to pass in the signature
being verified into KeyStoreCryptoOperationStreamer. This in turn is
needed to make it possible for NONEwithECDSA implementation to provide
a wrapper streamer which truncates input.
Bug:
22030217
Change-Id: I26064f6df37ef8c631d70a36a356aa0b76a9ad29
Selim Cinek [Wed, 24 Jun 2015 22:39:26 +0000 (22:39 +0000)]
am
117faced: am
1cc86956: Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev
* commit '
117faced25861b39abac90dc284981efcca811c2':
Fixed an inconsistency when booting up with SIMPIn
Selim Cinek [Wed, 24 Jun 2015 22:39:21 +0000 (22:39 +0000)]
am
60b716ef: am
3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
* commit '
60b716ef006091d335eda01c73cfe322b6208901':
Fixed a bug with encryption where the keyguard was never shown with PIN
Chris Wren [Wed, 24 Jun 2015 22:39:16 +0000 (22:39 +0000)]
am
bb9114ff: am
749d66b8: Merge "remove setLatestEventInfo" into mnc-dev
* commit '
bb9114ff6dcef85f118afa350c33c2c35a68f41d':
remove setLatestEventInfo
Joe Fernandez [Wed, 24 Jun 2015 22:34:08 +0000 (22:34 +0000)]
am
1769dd7b: am
ace0f92d: am
cede20a7: am
1ee8470c: am
3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '
1769dd7b6f4e6e5f4b80316db454ccf70c5bd357':
docs: Update Android support page
Selim Cinek [Wed, 24 Jun 2015 22:25:30 +0000 (22:25 +0000)]
am
1cc86956: Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev
* commit '
1cc869561e6615bf8c473cdf5dfc8773e4c839e5':
Fixed an inconsistency when booting up with SIMPIn
Selim Cinek [Wed, 24 Jun 2015 22:25:25 +0000 (22:25 +0000)]
am
3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
* commit '
3b9fbd2f2de75e53a836d3cb73bcfc25fdb3a67a':
Fixed a bug with encryption where the keyguard was never shown with PIN
Chris Wren [Wed, 24 Jun 2015 22:25:20 +0000 (22:25 +0000)]
am
749d66b8: Merge "remove setLatestEventInfo" into mnc-dev
* commit '
749d66b82fcfa82649536d2a0739a1a84edc0400':
remove setLatestEventInfo
Adam Lesinski [Wed, 24 Jun 2015 22:22:02 +0000 (22:22 +0000)]
am
0ebba0e1: am
53d0d065: am
b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev
* commit '
0ebba0e1a66ddf912b9fb7c43727054cb2d63556':
Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
Joe Fernandez [Wed, 24 Jun 2015 22:20:22 +0000 (22:20 +0000)]
am
ace0f92d: am
cede20a7: am
1ee8470c: am
3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '
ace0f92d9ace9da85c8465d812ce4c42180a151f':
docs: Update Android support page