Marco Nelissen
9e05ece7ab
am 0601a280: Merge "Sometimes the application context is null"
...
* commit '0601a280e5db18ff2c084a0785504f959c2ff92f':
Sometimes the application context is null
2015-04-22 19:31:26 +00:00
Marco Nelissen
0601a280e5
Merge "Sometimes the application context is null"
2015-04-22 19:06:47 +00:00
Justin Koh
ba75135a80
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.
2015-04-22 00:43:16 +00:00
ztenghui
059451e185
am 23606598: DO NOT MERGE: Reset the Node status when clone.
...
* commit '23606598244c2a297d994895eaf631b240d33242':
DO NOT MERGE: Reset the Node status when clone.
2015-04-22 00:43:08 +00:00
Justin Koh
2aa3905cb0
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev
2015-04-22 00:31:00 +00:00
Andreas Gampe
fb861b6c8d
am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
...
* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
Frameworks/base: Compile-time optimize SQLiteConnection
2015-04-21 23:59:57 +00:00
Andreas Gampe
31fb202e6f
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
2015-04-21 23:31:51 +00:00
Mathieu Chartier
765d7c3048
am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
...
* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
Update getExportedPropertyMethods to new reflection API
2015-04-21 23:26:49 +00:00
Andreas Gampe
c7f9f7656f
am 189d2785: Merge "Frameworks/base: Fix comment"
...
* commit '189d2785c3b71eac9c122c874586501a2ab723b2':
Frameworks/base: Fix comment
2015-04-21 23:26:41 +00:00
Mathieu Chartier
ba6783b69a
Merge "Update getExportedPropertyMethods to new reflection API"
2015-04-21 23:03:35 +00:00
Andreas Gampe
4f47b40e05
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
2015-04-21 16:01:00 -07:00
ztenghui
612e5cdec6
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
...
b/20119270
Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit 26e9a19900 )
2015-04-21 21:26:53 +00:00
ztenghui
2360659824
DO NOT MERGE: Reset the Node status when clone.
...
b/20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
2015-04-21 20:31:58 +00:00
Mathieu Chartier
a8a6516f62
Update getExportedPropertyMethods to new reflection API
...
Bug: 19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
2015-04-21 11:52:10 -07:00
Andreas Gampe
189d2785c3
Merge "Frameworks/base: Fix comment"
2015-04-21 16:10:28 +00:00
Andreas Gampe
dd8e5fbe96
Frameworks/base: Fix comment
...
Fix comment in ZygoteInit.
Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
2015-04-21 09:01:51 -07:00
Olawale Ogunwale
f7be8b6739
am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
...
* commit 'fa147b5caf7b44f76aee515afecda639fbc52c22':
[ActivityManager] Move UI operation to UI handler
2015-04-21 15:53:53 +00:00
Olawale Ogunwale
acaa886ce7
am 0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
...
* commit '0408187e7d2e7bdb6d0cb0521f49859a3d9a7396':
[ActivityManager] Avoid unnecessary restart provider process
2015-04-21 15:53:45 +00:00
Luan Nguyen
886e8e1137
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.
2015-04-21 15:35:41 +00:00
Olawale Ogunwale
fa147b5caf
Merge "[ActivityManager] Move UI operation to UI handler"
2015-04-21 15:31:59 +00:00
riddle_hsu
758f714ca8
[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
2015-04-21 15:31:39 +00:00
Olawale Ogunwale
0408187e7d
Merge "[ActivityManager] Avoid unnecessary restart provider process"
2015-04-21 15:29:09 +00:00
Marco Nelissen
d86281cb3d
Sometimes the application context is null
...
when called from systemui.
Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: Ic7b98e39fd9ad2436b855cf9f7f53d3e7a1948c0
2015-04-21 08:28:04 -07:00
Luan Nguyen
2fdd83a97a
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.
2015-04-21 15:24:36 +00:00
Craig Mautner
148187255e
am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"
...
* commit '80f99121ea96cdabea6260ab165e7183431be513':
Prevent infinite layout and wallpaper flashing
2015-04-21 15:19:06 +00:00
Luan Nguyen
d254577556
am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
...
* commit '4c20df0bbec2774e8829245547cfe8a42c5faea7':
docs: Add Channel API summary for Wear.
2015-04-21 15:12:51 +00:00
Luan Nguyen
4c20df0bbe
am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
...
* commit '4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
docs: Add Channel API summary for Wear.
2015-04-21 15:00:56 +00:00
Craig Mautner
80f99121ea
Merge "Prevent infinite layout and wallpaper flashing"
2015-04-21 14:54:44 +00:00
Luan Nguyen
4aebbfbb9b
Merge "docs: Add Channel API summary for Wear." into lmp-docs
2015-04-21 14:53:04 +00:00
Andreas Gampe
1f4f92ed74
am b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
...
* commit 'b6feabcfce080c2dc906434cf05ff606489cf39d':
Frameworks/base: Use better Class.forName in ZygoteInit
2015-04-21 04:26:53 +00:00
Andreas Gampe
b6feabcfce
Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
2015-04-21 04:02:00 +00:00
Andreas Gampe
c917f74d92
Frameworks/base: Use better Class.forName in ZygoteInit
...
Use the three-argument version of Class.forName. This saves an
expensive stack lookup for the caller's class-loader on each
invocation.
Bug: 19498458
Change-Id: I859affde31e580fd2de3f70ee0a9295936c2d9f4
2015-04-20 19:17:54 -07:00
Quddus Chong
8cde8f7f1e
am b1c838e0: am 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
...
* commit 'b1c838e03bf9f828e59deed57a7e7445cc2ad9e8':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-20 23:29:30 +00:00
Quddus Chong
b1c838e03b
am 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
...
* commit '6f14200880a79a9813f3448c15fe7097c3b7733b':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-20 23:15:17 +00:00
Quddus Chong
6f14200880
am 220f360e: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
...
* commit '220f360e02ae833fcadc342756932f76f6780626':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-20 23:03:32 +00:00
Quddus Chong
220f360e02
am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
...
* commit '900831f303beb4a67a871d969ac822d8b6d36460':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
2015-04-20 22:51:40 +00:00
Quddus Chong
900831f303
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
...
bug: 20304402
Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
2015-04-20 14:01:24 -07:00
Alex Klyubin
7b55b8f056
am c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
...
* commit 'c77c14c23d5617b7e4d69dccff890f3b1b55b567':
Make MediaPlayer fail fast on UnknownServiceException.
2015-04-20 18:34:05 +00:00
Alex Klyubin
c77c14c23d
Merge "Make MediaPlayer fail fast on UnknownServiceException."
2015-04-20 17:54:16 +00:00
Alex Klyubin
6db04b369e
Make MediaPlayer fail fast on UnknownServiceException.
...
This makes MediaPlayer's network streaming code fail fast when an
UnknownServiceException is encountered. This currently occurs when the
application declares that it does not perform cleartext network
traffic and tries to load media over cleartext HTTP. Without this CL,
MediaPlayer blocks for 30 seconds because it treats this error as
recoverable and goes into a ten retry loop with a three second delay
before each retry.
The result at MediaPlayer client level is
MediaPlayer.MEDIA_ERROR_UNKNOWN error. This error code is used for
non-recoverable situations such as when an invalid redirect is
encountered or the destination is unreachable.
Bug: 20026006
Change-Id: I10f0dadb7740902f8c7c73d0df96cfff31f08ada
2015-04-20 10:11:57 -07:00
Ryosuke Matsuuchi
fea08ccdff
am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '3d1a37e9ecffd89f61de27d924b0469a6a09ea8c':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:55:05 +00:00
Ryosuke Matsuuchi
3d1a37e9ec
am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:44:42 +00:00
Ryosuke Matsuuchi
38d969c5c8
am 558907f7: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '558907f702ab21d4166d5d7f7986cb18c4a993bd':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:32:53 +00:00
Ryosuke Matsuuchi
558907f702
am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
...
* commit '0d2f280310458d23618edf6550818f8f9cfa6b47':
doc: Add Korean version of DAC/distribute/ page.
2015-04-19 00:22:51 +00:00
Ryosuke Matsuuchi
0d2f280310
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
2015-04-19 00:15:12 +00:00
Dirk Dougherty
308cd16022
am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '488e5bbc2333adb1c84be90b797e1a8d36d070c3':
Doc change: distribute landing page.
2015-04-18 23:54:58 +00:00
Dirk Dougherty
488e5bbc23
am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '1696552f127c82aed9036eb1fa6b44c826d57eec':
Doc change: distribute landing page.
2015-04-18 23:43:54 +00:00
Dirk Dougherty
1696552f12
am 6e141199: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit '6e141199874f0c5603dee4fccc728412dad07d61':
Doc change: distribute landing page.
2015-04-18 23:32:46 +00:00
Dirk Dougherty
6e14119987
am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
...
* commit 'ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
Doc change: distribute landing page.
2015-04-18 23:22:48 +00:00
Dirk Dougherty
ff233af75f
Merge "Doc change: distribute landing page." into lmp-docs
2015-04-18 23:11:42 +00:00