OSDN Git Service
Kenny Root [Fri, 24 Apr 2015 21:49:47 +0000 (21:49 +0000)]
am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
frameworks/base: switch to using NativeConstants.
Kenny Root [Fri, 24 Apr 2015 21:26:06 +0000 (21:26 +0000)]
Merge "frameworks/base: switch to using NativeConstants."
Alex Klyubin [Fri, 24 Apr 2015 20:22:58 +0000 (20:22 +0000)]
am
e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit '
e2b9bb45d20102f121660ed361bd4225852a55e0':
No runtime exceptions during normal use of AndroidKeyStore crypto.
Alex Klyubin [Fri, 24 Apr 2015 20:00:57 +0000 (20:00 +0000)]
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
Scott Rowe [Fri, 24 Apr 2015 18:43:03 +0000 (18:43 +0000)]
am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
17c0b25441a264efe87ab2db82c04c0e018c178c':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:30:07 +0000 (18:30 +0000)]
am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
ccfedfccbe63af223027471ea80869d0fb011098':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:16:26 +0000 (18:16 +0000)]
am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5827af11bdcd9973afe04cb035e83c6428d1e562':
docs: Supported media protocols, codecs, formats for Android TV
Alex Klyubin [Fri, 24 Apr 2015 18:11:50 +0000 (18:11 +0000)]
am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
71223ebe1b2264b7463a02c8dafd779eb3b8c210':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:11:29 +0000 (18:11 +0000)]
am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
cf7d2d95adb358a628c2622b43a999d3ab784406':
[ActivityManager] Avoid orphan ContentProviderRecord.
Scott Rowe [Fri, 24 Apr 2015 18:01:15 +0000 (18:01 +0000)]
am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
02e4f2fbe6e0511789d42d5942548158d2dd154f':
docs: Supported media protocols, codecs, formats for Android TV
Leon Scroggins III [Fri, 24 Apr 2015 17:54:57 +0000 (17:54 +0000)]
am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
4c1f70db3dc37f818bdff09ec3e289b797acc397':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:54:50 +0000 (17:54 +0000)]
am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
6db29a92452c2a837528d20d024dcacefd450c17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Alex Klyubin [Tue, 21 Apr 2015 22:17:24 +0000 (15:17 -0700)]
No runtime exceptions during normal use of AndroidKeyStore crypto.
This changes the implementation of AndroidKeyStore-backed Cipher and
Mac to avoid throwing runtime exceptions during normal use. Runtime
exceptions will now be thrown only due to truly exceptional and
unrecoverable errors (e.g., keystore unreachable, or crypto primitive
not initialized).
This also changes the implementation of Cipher to cache any errors
encountered in Cipher.update until Cipher.doFinal which then throws
them as checked exceptions.
Bug:
20525947
Change-Id: I3c4ad57fe70abfbb817a79402f722a0208660727
Alex Klyubin [Fri, 24 Apr 2015 17:52:35 +0000 (17:52 +0000)]
Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
Scott Rowe [Fri, 24 Apr 2015 17:49:13 +0000 (17:49 +0000)]
Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
Alex Klyubin [Fri, 24 Apr 2015 17:47:17 +0000 (10:47 -0700)]
Reset AndroidKeyStore Mac and Cipher state when init fails.
For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.
Bug:
18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c
Leon Scroggins III [Fri, 24 Apr 2015 17:43:38 +0000 (17:43 +0000)]
am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
b3523d7f8f8274a04145ca34eab9821aafb52d7a':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:43:23 +0000 (17:43 +0000)]
am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
f828f43f97f4a018e2224e926b900713081a8c5b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Olawale Ogunwale [Fri, 24 Apr 2015 17:42:58 +0000 (17:42 +0000)]
Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
Leon Scroggins III [Fri, 24 Apr 2015 17:33:04 +0000 (17:33 +0000)]
am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
41c458c81125fb6e3fc9eb5304f0d3216a0a2d74':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:32:59 +0000 (17:32 +0000)]
am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Mark Renouf [Fri, 24 Apr 2015 17:31:31 +0000 (17:31 +0000)]
am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
55555a3dab1f3b99a3299b90851624e9dc10f3cc':
Fixes rejected dismiss gestures (framework version of ag/677161)
Leon Scroggins III [Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)]
am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
67326bcba0f7287367dedba4caaf2a168a43f057':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:15:43 +0000 (17:15 +0000)]
am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
16ac8ad7fac73524b5296f955884bd2aec405ded':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Adam Langley [Fri, 24 Apr 2015 16:59:35 +0000 (09:59 -0700)]
frameworks/base: switch to using NativeConstants.
NativeCrypto is a conscrypt class that contained several OpenSSL
constants. NativeConstants is the new class that contains the same
thing, but the latter is automatically generated and thus won't drift
from the C headers.
Bug:
20521989
Change-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc
Mark Renouf [Fri, 24 Apr 2015 15:47:27 +0000 (11:47 -0400)]
Fixes rejected dismiss gestures (framework version of ag/677161)
Gus's original change description:
This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.
Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not. At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.
In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.
BUG:
20542762
(Same as b/
20350515 but for Activity dismissal at the system level.)
Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
Neil Fuller [Fri, 24 Apr 2015 10:50:52 +0000 (10:50 +0000)]
am
0e29681f: Merge "Load ICU4J data on boot"
* commit '
0e29681f98dad8df9f772d86a848190138245f3d':
Load ICU4J data on boot
Neil Fuller [Fri, 24 Apr 2015 10:30:16 +0000 (10:30 +0000)]
Merge "Load ICU4J data on boot"
Andrew Solovay [Thu, 23 Apr 2015 20:53:23 +0000 (20:53 +0000)]
am
4dde4c9e: am
e45e41d7: am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
4dde4c9e723826fae1275c6537d2d5a615b3a0ae':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 20:41:14 +0000 (20:41 +0000)]
am
e45e41d7: am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
e45e41d7fa6c88cf74be31a509003b8f9e7fa7b1':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 20:29:42 +0000 (20:29 +0000)]
am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
44fa5e71ab709c83af387958598f551583d6dbb0':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 20:18:51 +0000 (20:18 +0000)]
am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
5b3152cffcd90441ca4cacdf5596e9bb3428af08':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 20:06:29 +0000 (20:06 +0000)]
Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
Andrew Solovay [Thu, 23 Apr 2015 19:09:28 +0000 (19:09 +0000)]
am
dad05551: am
24ccb900: am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
dad055518f3416d2c212230343cb8f9433e395a2':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Thu, 23 Apr 2015 18:56:26 +0000 (18:56 +0000)]
am
24ccb900: am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
24ccb900258443bff7d943ad0d4fe1ff1f6f0ba4':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Thu, 23 Apr 2015 18:44:24 +0000 (18:44 +0000)]
am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
7a866a88318f6a44f316dc18e0472f39a289fee6':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Thu, 23 Apr 2015 18:31:59 +0000 (18:31 +0000)]
am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Thu, 23 Apr 2015 18:20:06 +0000 (18:20 +0000)]
Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
Leon Scroggins III [Thu, 23 Apr 2015 16:41:49 +0000 (16:41 +0000)]
am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 16:29:22 +0000 (16:29 +0000)]
am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
ee35410ff8297b1ab39f3e546ebcedc27300a7de':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 16:20:02 +0000 (16:20 +0000)]
am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
a7501119e341626536ce12c3539c2f9a986a2945':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:53:24 +0000 (15:53 +0000)]
am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
4a6ca6724c789603626d74a8cc187365788a6cfd':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:48:12 +0000 (15:48 +0000)]
am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
69b8e962e1b8346b33a2c14889547a0ac00c8b17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Svet Ganov [Thu, 23 Apr 2015 15:43:01 +0000 (15:43 +0000)]
am
d24cc193: am
db672b6c: am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
d24cc19343073294b3376f825bdc0d54a8d692f1':
DO NOT MERGE Don't take flags when creating app widget config activity.
Svet Ganov [Thu, 23 Apr 2015 15:30:43 +0000 (15:30 +0000)]
am
db672b6c: am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
db672b6cde256e27c1188c7e99f23e5a65252ba4':
DO NOT MERGE Don't take flags when creating app widget config activity.
Svet Ganov [Thu, 23 Apr 2015 15:18:10 +0000 (15:18 +0000)]
am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
00e91901fd1dd007de196ada04e3fc2f79e1be73':
DO NOT MERGE Don't take flags when creating app widget config activity.
Svet Ganov [Thu, 23 Apr 2015 15:09:46 +0000 (15:09 +0000)]
Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev
Neil Fuller [Thu, 23 Apr 2015 13:50:34 +0000 (14:50 +0100)]
Load ICU4J data on boot
Bug:
20252074
Bug:
20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
Quddus Chong [Thu, 23 Apr 2015 04:43:41 +0000 (04:43 +0000)]
am
d80f4fc8: am
04002800: am
d57ccb8d: am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
d80f4fc80a132b40ace7ba2b51eb784d73443004':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Thu, 23 Apr 2015 04:43:35 +0000 (04:43 +0000)]
am
918b71ca: am
a5cca430: am
7a8b0945: am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
918b71ca319373c0025c2ddf0168877c7bc8d306':
docs: Added What's New section for GMS v7.3 (Parmesan).
Luan Nguyen [Thu, 23 Apr 2015 04:43:29 +0000 (04:43 +0000)]
am
8cc54aa3: am
4b76e896: am
1cc56633: am
33ac358a: docs: Add Wear Capability training
* commit '
8cc54aa311daf3aca1a0c793eee268bfb4d5b149':
docs: Add Wear Capability training
Quddus Chong [Thu, 23 Apr 2015 03:40:29 +0000 (03:40 +0000)]
am
04002800: am
d57ccb8d: am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
040028000c0769606cbd5a9265f385e68c15433c':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Thu, 23 Apr 2015 03:40:22 +0000 (03:40 +0000)]
am
a5cca430: am
7a8b0945: am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
a5cca4303616e86242b4d5c5f09edbb5668e7f6b':
docs: Added What's New section for GMS v7.3 (Parmesan).
Luan Nguyen [Thu, 23 Apr 2015 03:39:53 +0000 (03:39 +0000)]
am
4b76e896: am
1cc56633: am
33ac358a: docs: Add Wear Capability training
* commit '
4b76e8967cd435c2d0b01f2b9a2f11a9a4bc547e':
docs: Add Wear Capability training
Quddus Chong [Thu, 23 Apr 2015 00:01:07 +0000 (00:01 +0000)]
am
d57ccb8d: am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
d57ccb8d3c814ea46d735d7443e02e669207afef':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Thu, 23 Apr 2015 00:01:03 +0000 (00:01 +0000)]
am
7a8b0945: am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
7a8b094521832586b142de34c91ab2c886eb5109':
docs: Added What's New section for GMS v7.3 (Parmesan).
Quddus Chong [Wed, 22 Apr 2015 23:48:00 +0000 (23:48 +0000)]
am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Wed, 22 Apr 2015 23:47:55 +0000 (23:47 +0000)]
am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
789c59711e55be981ed2093228ded0c588e74ba0':
docs: Added What's New section for GMS v7.3 (Parmesan).
Quddus Chong [Wed, 22 Apr 2015 23:38:20 +0000 (23:38 +0000)]
Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
Quddus Chong [Wed, 22 Apr 2015 23:37:32 +0000 (23:37 +0000)]
Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs
Yang Ni [Wed, 22 Apr 2015 23:37:06 +0000 (23:37 +0000)]
am
f5fa550a: Merge "Move new script group API into ScriptGroup class"
* commit '
f5fa550afafa2276abce78b3e5779ce11dc16c68':
Move new script group API into ScriptGroup class
Yang Ni [Wed, 22 Apr 2015 23:14:34 +0000 (23:14 +0000)]
Merge "Move new script group API into ScriptGroup class"
Yang Ni [Fri, 17 Apr 2015 23:51:55 +0000 (16:51 -0700)]
Move new script group API into ScriptGroup class
And mark existing methods and builder deprecated.
Removed ScriptGroup2 class.
Renamed nested class UnboundValue to Input.
Marked classes Closure, Future, and Input as final.
Change-Id: I362910c115e9d0173dc515674e08bf4878232879
Quddus Chong [Thu, 16 Apr 2015 16:07:28 +0000 (09:07 -0700)]
docs: Added What's New section for GMS v7.3 (Parmesan).
Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
Marco Nelissen [Wed, 22 Apr 2015 20:28:54 +0000 (20:28 +0000)]
am
ba43f7e9: Merge "Revert "Sometimes the application context is null""
* commit '
ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b':
Revert "Sometimes the application context is null"
Marco Nelissen [Wed, 22 Apr 2015 20:08:36 +0000 (20:08 +0000)]
Merge "Revert "Sometimes the application context is null""
Marco Nelissen [Wed, 22 Apr 2015 20:07:15 +0000 (20:07 +0000)]
Revert "Sometimes the application context is null"
This reverts commit
d86281cb3da685672d89f964228980f6753adcae.
Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
Marco Nelissen [Wed, 22 Apr 2015 19:31:26 +0000 (19:31 +0000)]
am
0601a280: Merge "Sometimes the application context is null"
* commit '
0601a280e5db18ff2c084a0785504f959c2ff92f':
Sometimes the application context is null
Marco Nelissen [Wed, 22 Apr 2015 19:06:36 +0000 (19:06 +0000)]
Merge "Sometimes the application context is null"
Justin Koh [Wed, 22 Apr 2015 00:43:16 +0000 (00:43 +0000)]
am
2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
* commit '
2aa3905cb0cc595783ab43b0bc7a4b3818003958':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
ztenghui [Wed, 22 Apr 2015 00:43:08 +0000 (00:43 +0000)]
am
23606598: DO NOT MERGE: Reset the Node status when clone.
* commit '
23606598244c2a297d994895eaf631b240d33242':
DO NOT MERGE: Reset the Node status when clone.
Justin Koh [Wed, 22 Apr 2015 00:30:59 +0000 (00:30 +0000)]
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev
Andreas Gampe [Tue, 21 Apr 2015 23:59:57 +0000 (23:59 +0000)]
am
31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '
31fb202e6f6687f86ec4fc33b18aafacbf67c797':
Frameworks/base: Compile-time optimize SQLiteConnection
Andreas Gampe [Tue, 21 Apr 2015 23:31:51 +0000 (23:31 +0000)]
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
Mathieu Chartier [Tue, 21 Apr 2015 23:26:49 +0000 (23:26 +0000)]
am
ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit '
ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
Update getExportedPropertyMethods to new reflection API
Andreas Gampe [Tue, 21 Apr 2015 23:26:41 +0000 (23:26 +0000)]
am
189d2785: Merge "Frameworks/base: Fix comment"
* commit '
189d2785c3b71eac9c122c874586501a2ab723b2':
Frameworks/base: Fix comment
Mathieu Chartier [Tue, 21 Apr 2015 23:03:33 +0000 (23:03 +0000)]
Merge "Update getExportedPropertyMethods to new reflection API"
Andreas Gampe [Mon, 20 Apr 2015 22:29:04 +0000 (15:29 -0700)]
Frameworks/base: Compile-time optimize SQLiteConnection
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).
Bug:
19498458
Bug:
19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
Luan Nguyen [Tue, 21 Apr 2015 22:54:59 +0000 (22:54 +0000)]
am
1cc56633: am
33ac358a: docs: Add Wear Capability training
* commit '
1cc5663357def0221b46f86e6295ea01c40be2a1':
docs: Add Wear Capability training
Luan Nguyen [Tue, 21 Apr 2015 22:40:59 +0000 (22:40 +0000)]
am
33ac358a: docs: Add Wear Capability training
* commit '
33ac358a5a4199549d11ba1931243e7dc8a7ab85':
docs: Add Wear Capability training
ztenghui [Fri, 10 Apr 2015 20:14:17 +0000 (13:14 -0700)]
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
b/
20119270
Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit
26e9a19900bae56b012425a114685d42dfa2fde1)
ztenghui [Tue, 21 Apr 2015 20:00:08 +0000 (13:00 -0700)]
DO NOT MERGE: Reset the Node status when clone.
b/
20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
Mathieu Chartier [Fri, 17 Apr 2015 19:49:57 +0000 (12:49 -0700)]
Update getExportedPropertyMethods to new reflection API
Bug:
19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
Andreas Gampe [Tue, 21 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Frameworks/base: Fix comment"
Andreas Gampe [Tue, 21 Apr 2015 16:01:51 +0000 (09:01 -0700)]
Frameworks/base: Fix comment
Fix comment in ZygoteInit.
Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
Olawale Ogunwale [Tue, 21 Apr 2015 15:53:53 +0000 (15:53 +0000)]
am
fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
* commit '
fa147b5caf7b44f76aee515afecda639fbc52c22':
[ActivityManager] Move UI operation to UI handler
Olawale Ogunwale [Tue, 21 Apr 2015 15:53:45 +0000 (15:53 +0000)]
am
0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
* commit '
0408187e7d2e7bdb6d0cb0521f49859a3d9a7396':
[ActivityManager] Avoid unnecessary restart provider process
Luan Nguyen [Tue, 21 Apr 2015 15:35:41 +0000 (15:35 +0000)]
am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
2fdd83a97a0dd3de36264928ff42dcc0a098018f':
docs: Add Channel API summary for Wear.
Olawale Ogunwale [Tue, 21 Apr 2015 15:31:58 +0000 (15:31 +0000)]
Merge "[ActivityManager] Move UI operation to UI handler"
riddle_hsu [Thu, 16 Apr 2015 04:45:48 +0000 (12:45 +0800)]
[ActivityManager] Move UI operation to UI handler
Because ANR will dump cpu usage, stack traces in ActivityManager
thread, if system is busy or in low-end device, it may spend more
than 5s to dump. So when there is UI operation (e.g. pop dialog)
in ActivityManager thread, it may meet key dispatch timeout.
Change-Id: Ie550e31a7cff65bdcfc9af2c32989e9deb5fb2cf
Olawale Ogunwale [Tue, 21 Apr 2015 15:29:09 +0000 (15:29 +0000)]
Merge "[ActivityManager] Avoid unnecessary restart provider process"
Marco Nelissen [Fri, 17 Apr 2015 16:50:56 +0000 (09:50 -0700)]
Sometimes the application context is null
when called from systemui.
Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: Ic7b98e39fd9ad2436b855cf9f7f53d3e7a1948c0
Luan Nguyen [Tue, 14 Apr 2015 15:54:22 +0000 (08:54 -0700)]
docs: Add Wear Capability training
bug:
20088602
Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
Luan Nguyen [Tue, 21 Apr 2015 15:24:36 +0000 (15:24 +0000)]
am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
d2545775568694c75c9589eaf7c894583e37de4e':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 15:19:06 +0000 (15:19 +0000)]
am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
80f99121ea96cdabea6260ab165e7183431be513':
Prevent infinite layout and wallpaper flashing
Luan Nguyen [Tue, 21 Apr 2015 15:12:51 +0000 (15:12 +0000)]
am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4c20df0bbec2774e8829245547cfe8a42c5faea7':
docs: Add Channel API summary for Wear.
Luan Nguyen [Tue, 21 Apr 2015 15:00:56 +0000 (15:00 +0000)]
am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 14:54:42 +0000 (14:54 +0000)]
Merge "Prevent infinite layout and wallpaper flashing"
Luan Nguyen [Tue, 21 Apr 2015 14:53:02 +0000 (14:53 +0000)]
Merge "docs: Add Channel API summary for Wear." into lmp-docs
Andreas Gampe [Tue, 21 Apr 2015 04:26:53 +0000 (04:26 +0000)]
am
b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
* commit '
b6feabcfce080c2dc906434cf05ff606489cf39d':
Frameworks/base: Use better Class.forName in ZygoteInit