OSDN Git Service
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
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, 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
Andreas Gampe [Tue, 21 Apr 2015 04:01:59 +0000 (04:01 +0000)]
Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
Andreas Gampe [Tue, 21 Apr 2015 02:16:37 +0000 (19:16 -0700)]
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
Quddus Chong [Mon, 20 Apr 2015 23:29:30 +0000 (23:29 +0000)]
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
Quddus Chong [Mon, 20 Apr 2015 23:15:17 +0000 (23:15 +0000)]
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
Quddus Chong [Mon, 20 Apr 2015 23:03:32 +0000 (23:03 +0000)]
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
Quddus Chong [Mon, 20 Apr 2015 22:51:40 +0000 (22:51 +0000)]
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
Quddus Chong [Fri, 17 Apr 2015 22:01:16 +0000 (15:01 -0700)]
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
bug:
20304402
Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
Alex Klyubin [Mon, 20 Apr 2015 18:34:05 +0000 (18:34 +0000)]
am
c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '
c77c14c23d5617b7e4d69dccff890f3b1b55b567':
Make MediaPlayer fail fast on UnknownServiceException.
Alex Klyubin [Mon, 20 Apr 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Make MediaPlayer fail fast on UnknownServiceException."
Alex Klyubin [Mon, 20 Apr 2015 17:11:57 +0000 (10:11 -0700)]
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
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:55:05 +0000 (00:55 +0000)]
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.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:44:42 +0000 (00:44 +0000)]
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.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:32:53 +0000 (00:32 +0000)]
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.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:22:51 +0000 (00:22 +0000)]
am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
0d2f280310458d23618edf6550818f8f9cfa6b47':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:15:09 +0000 (00:15 +0000)]
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:54:58 +0000 (23:54 +0000)]
am
488e5bbc: am
1696552f: am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
488e5bbc2333adb1c84be90b797e1a8d36d070c3':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:43:54 +0000 (23:43 +0000)]
am
1696552f: am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
1696552f127c82aed9036eb1fa6b44c826d57eec':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:32:46 +0000 (23:32 +0000)]
am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
6e141199874f0c5603dee4fccc728412dad07d61':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:22:48 +0000 (23:22 +0000)]
am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:11:40 +0000 (23:11 +0000)]
Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Mon, 10 Nov 2014 19:50:41 +0000 (11:50 -0800)]
Doc change: distribute landing page.
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
Sean Wan [Fri, 17 Apr 2015 23:55:21 +0000 (23:55 +0000)]
am
b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
* commit '
b792f43301c61cce996dd5bac4589b4720a37bec':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Sean Wan [Fri, 17 Apr 2015 23:45:37 +0000 (23:45 +0000)]
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
Sean Wan [Tue, 14 Apr 2015 21:26:40 +0000 (14:26 -0700)]
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Bug:
19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
Dmitriy Ivanov [Fri, 17 Apr 2015 19:20:22 +0000 (19:20 +0000)]
am
b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
b0557acebc7a47f6d8a3653c376165160fc68105':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dmitriy Ivanov [Fri, 17 Apr 2015 19:01:40 +0000 (19:01 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:29 +0000 (11:50 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
It is no longer needed.
Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
Dan Albert [Fri, 17 Apr 2015 18:06:54 +0000 (18:06 +0000)]
am
fef8bcf9: Merge "Explicitly use clang."
* commit '
fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
Explicitly use clang.
Dan Albert [Fri, 17 Apr 2015 17:43:35 +0000 (17:43 +0000)]
Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 17:40:48 +0000 (10:40 -0700)]
Explicitly use clang.
This was implicitly enabled by using ASAN.
Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
Rich Slogar [Fri, 17 Apr 2015 17:37:51 +0000 (17:37 +0000)]
am
c1002dfc: am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
c1002dfc52ec2827d24b6c4722a47abbb99b7f16':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:37:45 +0000 (17:37 +0000)]
am
1252b4b8: am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
1252b4b8694a69150b79ecfd801ed62c6929edf3':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:27:13 +0000 (17:27 +0000)]
am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
71a616e05065e39a5a13b483b031a2040dc52eda':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:27:07 +0000 (17:27 +0000)]
am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
61dd1dfda1e3f9d2c58a5d1719818b66134cadb9':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:14:48 +0000 (17:14 +0000)]
am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
203a47395dfc17ba9e9b6b46c65bfbde002312f6':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:14:43 +0000 (17:14 +0000)]
am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
684f3aa264e678affc1b33b27602493c96ee7eac':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 17:03:04 +0000 (17:03 +0000)]
am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
1fcc6bd854f6e152cf8796a4a70965e350c3bdcf':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:02:59 +0000 (17:02 +0000)]
am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
efe861a4a7081da795fe6a0843308ca7cef26277':
docs: hierarchyviewer updates
Rich Slogar [Fri, 17 Apr 2015 16:53:33 +0000 (16:53 +0000)]
Merge "docs: studio remove gradle tasks dialog" into lmp-docs
Rich Slogar [Fri, 17 Apr 2015 16:52:44 +0000 (16:52 +0000)]
Merge "docs: hierarchyviewer updates" into lmp-docs
Olawale Ogunwale [Fri, 17 Apr 2015 16:13:03 +0000 (16:13 +0000)]
am
c0c8d198: Merge "[ActivityManager] Fix activity always visible."
* commit '
c0c8d1983c5d7c9bc9469944a9d46856aff95ab9':
[ActivityManager] Fix activity always visible.
Luan Nguyen [Mon, 13 Apr 2015 18:02:32 +0000 (11:02 -0700)]
docs: Add Channel API summary for Wear.
bug:
20089257
Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
Olawale Ogunwale [Fri, 17 Apr 2015 15:50:46 +0000 (15:50 +0000)]
Merge "[ActivityManager] Fix activity always visible."
Martijn Coenen [Fri, 17 Apr 2015 07:25:27 +0000 (07:25 +0000)]
am
e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
* commit '
e386f7f5108e9c2aa7547394f23d5936d7993cfe':
Expose peer LLCP version in NDEF callbacks.
Martijn Coenen [Fri, 17 Apr 2015 07:02:54 +0000 (07:02 +0000)]
Merge "Expose peer LLCP version in NDEF callbacks."
Ryosuke Matsuuchi [Tue, 14 Apr 2015 09:44:35 +0000 (18:44 +0900)]
doc: Add Korean version of DAC/distribute/ page.
Bug:
20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
Filip Gruszczynski [Fri, 17 Apr 2015 00:59:39 +0000 (00:59 +0000)]
am
4544b927: Hold a wake lock while dozing when wallpaper draws.
* commit '
4544b927d7f3575bf609490b42d521a12bf95a07':
Hold a wake lock while dozing when wallpaper draws.
Chad Brubaker [Thu, 16 Apr 2015 22:23:29 +0000 (22:23 +0000)]
am
e5e49a17: Merge "Support KM_LONG_REP"
* commit '
e5e49a175c27b95d6b8928ab435bfde9f9db3c81':
Support KM_LONG_REP
Filip Gruszczynski [Thu, 16 Apr 2015 20:18:58 +0000 (13:18 -0700)]
Hold a wake lock while dozing when wallpaper draws.
This mimics what ViewRootImpl does before drawing.
Bug:
20242788
Change-Id: If85ad17113636f74267aedb3af04d0281b57ac0e
Chad Brubaker [Thu, 16 Apr 2015 21:56:10 +0000 (21:56 +0000)]
Merge "Support KM_LONG_REP"
Chad Brubaker [Thu, 16 Apr 2015 21:30:30 +0000 (14:30 -0700)]
Support KM_LONG_REP
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
Alex Klyubin [Thu, 16 Apr 2015 20:09:05 +0000 (20:09 +0000)]
am
499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
* commit '
499126c43385ba7bce9b8547b61bafd0c6311147':
Add Keymaster KM_ORIGIN_UNKNOWN constant.
Alex Klyubin [Thu, 16 Apr 2015 19:50:11 +0000 (19:50 +0000)]
Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."
Deepanshu Gupta [Thu, 16 Apr 2015 17:41:54 +0000 (17:41 +0000)]
am
1f3c7f3f: am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
1f3c7f3f500bdbfd790c20872961d84ef617f066':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Deepanshu Gupta [Thu, 16 Apr 2015 17:31:34 +0000 (17:31 +0000)]
am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Brian Carlstrom [Thu, 16 Apr 2015 17:31:34 +0000 (17:31 +0000)]
am
14a982aa: Merge "Document hprof-conv -z"
* commit '
14a982aa7a38fa89c916c252996632d401b1d043':
Document hprof-conv -z
Deepanshu Gupta [Thu, 16 Apr 2015 17:19:42 +0000 (17:19 +0000)]
am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Deepanshu Gupta [Thu, 16 Apr 2015 17:12:41 +0000 (17:12 +0000)]
Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev
* changes:
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Brian Carlstrom [Thu, 16 Apr 2015 17:07:58 +0000 (17:07 +0000)]
Merge "Document hprof-conv -z"
Brian Carlstrom [Fri, 27 Mar 2015 05:41:45 +0000 (22:41 -0700)]
Document hprof-conv -z
Bug:
18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
Alex Klyubin [Thu, 16 Apr 2015 16:57:12 +0000 (16:57 +0000)]
am
b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit '
b9a78c7939e9b31c807106166cafe65dc5af777d':
Add IV-related Keymaster error codes.
Alex Klyubin [Thu, 16 Apr 2015 16:57:05 +0000 (16:57 +0000)]
am
216d18b9: Merge "Remove IV auto-generation workaround."
* commit '
216d18b997eb929c2c3af9b2102595f4ec694c20':
Remove IV auto-generation workaround.
Alex Klyubin [Thu, 16 Apr 2015 16:39:30 +0000 (16:39 +0000)]
Merge "Add IV-related Keymaster error codes."
Alex Klyubin [Thu, 16 Apr 2015 16:39:07 +0000 (16:39 +0000)]
Merge "Remove IV auto-generation workaround."
riddle_hsu [Thu, 16 Apr 2015 03:36:23 +0000 (11:36 +0800)]
[ActivityManager] Avoid unnecessary restart provider process
Caller C accesses provider P. Both processes of C and P died
before P publishes, P will still be restarted even there is
no connection because P is in mLaunchingProviders.
When device is low memory, the restarting provider process
may be killed easily before publish because no caller to raise
its oom-adj. Then device will busy keeping restart it.
Solution:
If there is no connection to the provider, do not restart it.
Change-Id: If6f2d2258d78b6c0989c6e5f3e0cad14db821464
Miao Wang [Thu, 16 Apr 2015 02:21:37 +0000 (02:21 +0000)]
am
782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '
782b43394ef48e7cf8e75404c534a46074d42d4e':
[RenderScript] typo fix in Allocation.java
Miao Wang [Thu, 16 Apr 2015 02:03:26 +0000 (02:03 +0000)]
Merge "[RenderScript] typo fix in Allocation.java"
Deepanshu Gupta [Wed, 15 Apr 2015 00:26:09 +0000 (17:26 -0700)]
Update golden image for tests.
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
Deepanshu Gupta [Tue, 14 Apr 2015 23:39:41 +0000 (16:39 -0700)]
Update to using LayoutlibCallback.
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
Deepanshu Gupta [Tue, 14 Apr 2015 22:17:07 +0000 (15:17 -0700)]
Remove implementation of deprecated method.
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.
Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847