174967 Commits

Author SHA1 Message Date
Yang Ni
f5fa550afa Merge "Move new script group API into ScriptGroup class" 2015-04-22 23:14:38 +00:00
Yang Ni
ead1af8319 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
2015-04-22 15:34:07 -07:00
Marco Nelissen
29f16933a8 Sometimes the application context is null
when called from systemui.

Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: I27153a48d7edce7006517507d813e24ce6f63a7d
2015-04-22 13:11:30 -07:00
Marco Nelissen
ba43f7e914 Merge "Revert "Sometimes the application context is null"" 2015-04-22 20:08:38 +00:00
Marco Nelissen
360f2ab62d Revert "Sometimes the application context is null"
This reverts commit d86281cb3da685672d89f964228980f6753adcae.

Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
2015-04-22 20:07:15 +00:00
Marco Nelissen
0601a280e5 Merge "Sometimes the application context is null" 2015-04-22 19:06:47 +00:00
Andreas Gampe
31fb202e6f Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 2015-04-21 23:31:51 +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
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
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
Craig Mautner
80f99121ea Merge "Prevent infinite layout and wallpaper flashing" 2015-04-21 14:54:44 +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
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
Dmitriy Ivanov
b0557acebc Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS" 2015-04-17 19:01:42 +00:00
Dmitriy Ivanov
811b7266fd Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
It is no longer needed.

Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
2015-04-17 11:50:29 -07:00
Dan Albert
fef8bcf921 Merge "Explicitly use clang." 2015-04-17 17:43:36 +00:00
Dan Albert
b9f6b0eec3 Explicitly use clang.
This was implicitly enabled by using ASAN.

Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
2015-04-17 10:40:48 -07:00
Olawale Ogunwale
c0c8d1983c Merge "[ActivityManager] Fix activity always visible." 2015-04-17 15:50:48 +00:00
Martijn Coenen
e386f7f510 Merge "Expose peer LLCP version in NDEF callbacks." 2015-04-17 07:02:59 +00:00
Chad Brubaker
e5e49a175c Merge "Support KM_LONG_REP" 2015-04-16 21:56:13 +00:00
Chad Brubaker
b543b39354 Support KM_LONG_REP
Change-Id: I37814bcb03dc8918e27226ec43230fa4218723d0
2015-04-16 14:39:51 -07:00
Alex Klyubin
499126c433 Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." 2015-04-16 19:50:12 +00:00
Brian Carlstrom
14a982aa7a Merge "Document hprof-conv -z" 2015-04-16 17:08:00 +00:00
Brian Carlstrom
d7931acf4a Document hprof-conv -z
Bug: 18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
2015-04-16 10:06:58 -07:00
Alex Klyubin
b9a78c7939 Merge "Add IV-related Keymaster error codes." 2015-04-16 16:39:31 +00:00
Alex Klyubin
216d18b997 Merge "Remove IV auto-generation workaround." 2015-04-16 16:39:10 +00:00
riddle_hsu
239d17c05a [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
2015-04-16 11:36:23 +08:00
Miao Wang
782b43394e Merge "[RenderScript] typo fix in Allocation.java" 2015-04-16 02:03:32 +00:00
Miao Wang
179e8b5351 [RenderScript] typo fix in Allocation.java
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
2015-04-15 17:44:32 -07:00
Alex Klyubin
a0d2dddc55 Remove IV auto-generation workaround.
This workaround prevents use of keys with randomized encryption
(IND-CPA). Since randomized encryption is on by default, it's better
to keep it working and break non-randomized encryption (until
Keymaster is fixed).

Bug: 18088752
Change-Id: I4b11ce72cff705be41d3e66f28b507d6ddc1da79
2015-04-15 17:20:23 -07:00
Alex Klyubin
37d81d035c Add IV-related Keymaster error codes.
Bug: 18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
2015-04-15 17:18:19 -07:00
Tim Murray
7f72f74766 Merge "Add BNNM intrinsic." 2015-04-15 22:30:14 +00:00
Shawn Willden
71ba4e461f Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." 2015-04-15 17:37:37 +00:00
Michael Wright
150e0e87e1 Merge "fix return value scale of notifyANR()" 2015-04-15 10:53:21 +00:00
Martijn Coenen
fd70bb1367 Expose peer LLCP version in NDEF callbacks.
Change-Id: I98b9a9764b66345f842c1f845c8a386161d965f5
2015-04-15 12:33:37 +02:00
Martijn Coenen
6a47a86112 Merge "Add getPrefixAids()." 2015-04-15 08:00:13 +00:00
Martijn Coenen
ed3a29ea08 Add getPrefixAids().
Bug: 19144664
Change-Id: Ia49550102ccf1d40cd3f2bf7e5bd64d444a2e8a3
2015-04-15 09:48:57 +02:00
Alex Klyubin
5eacd777fe Unbreak obtaining symmetric keys from AndroidKeyStore.
This tracks 59f977c6988e21b3b8aa6c83428bd6ee1a98816d due to which
AndroidKeyStore is unable to provide symmetric keys because it
assumes that the digest field is not repeating.

Bug: 18088752
Change-Id: Ie8ed01449280b7c759e81aeaf2066953b0abaf2a
2015-04-14 19:02:46 -07:00
baik.han
def340d45e fix return value scale of notifyANR()
fix return value scale of notifyANR()
from milliseconds to nanoseconds when windowState is not null
This prevent unintended frequent method calls of notifyANR()
in a very short time.

Change-Id: Icc1f363b3ed3538821a42c080809567473bfb833
Signed-off-by: Baik Han <baik.han@lge.com>
2015-04-15 10:21:05 +09:00
Hiroshi Yamauchi
82992b7270 Merge "Fix javadoc error in Debug.getRuntimeStats()." 2015-04-14 23:49:03 +00:00
Dan Albert
571c5a26f7 Merge "Fix UB in ResourceTable::stringToInt." 2015-04-14 23:25:27 +00:00
Hiroshi Yamauchi
d8001676ea Fix javadoc error in Debug.getRuntimeStats().
Bug: 19825248
Change-Id: Id7131732d30f01c3edd01c6d4c7c391095ffd054
2015-04-14 16:08:49 -07:00