159320 Commits

Author SHA1 Message Date
Tim Murray
aefbd5f97c Enable native tracking for RS contexts to improve GC behavior.
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
2014-12-12 11:34:48 -08:00
Olawale Ogunwale
0e954dccab am bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
* commit 'bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
  [ActivityManager] Fix NPE when start activity
2014-12-12 13:57:06 +00:00
Olawale Ogunwale
bfb30244fb Merge "[ActivityManager] Fix NPE when start activity" 2014-12-12 13:49:51 +00:00
minho.choo
649acab389 Fix bugs regarding delay the dispatching of non-wakeup alarms
checkAllowNonWakeupDelayLocked() method determines that delay the dispatching of non-wakeup alarms.
(there are no wakeup alarms and the screen is off, it can delay until the future.)

if there is any pending non-wakeup alarms, non-wakeup alarm delivery time is bigger than nowELAPSED.
but, checkAllowNonWakeupDelayLocked() returns false and non-wakeup alarm is not delay until future.

i think it is necessary to reverse the inequality symbol on "mNextNonWakeupDeliveryTime > nowELAPSED"
if it isn't, Could you let me know when we get ¡°stuck in a loop¡± in the comment of checkAllowNonWakeupDelayLocked () method?

Change-Id: I7e972064547f4d0a9b4175dbd4cf735b4837abfd
Signed-off-by: Minho Choo <minho.choo@lge.com>
2014-12-12 16:13:55 +09:00
Chih-hung Hsieh
b0dd6d3a8a am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
* commit '4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
  Adjust format strings to work on both 32-bit and 64-bit builds
2014-12-11 20:54:56 +00:00
Chih-hung Hsieh
4c23a0ec16 Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 2014-12-11 20:49:30 +00:00
Narayan Kamath
bc59ca4bdb am 31462128: Merge "Avoid tearing down process groups twice."
* commit '314621287801ba4c71467aad4702114eeb4d9951':
  Avoid tearing down process groups twice.
2014-12-11 10:28:10 +00:00
Narayan Kamath
37da3f0d28 am 7bd28de5: Merge "Remove some crufty "core" tests."
* commit '7bd28de5781293b1b2b4224762bd909d097adbda':
  Remove some crufty "core" tests.
2014-12-11 10:28:04 +00:00
Narayan Kamath
3146212878 Merge "Avoid tearing down process groups twice." 2014-12-11 09:15:06 +00:00
Narayan Kamath
7bd28de578 Merge "Remove some crufty "core" tests." 2014-12-11 09:14:15 +00:00
Narayan Kamath
d627c6761f Remove some crufty "core" tests.
nobody runs these, and these things are well tested elsewhere
and a part of CTS.

Change-Id: I1ec00f2a085fc82f902f538ace692ac989ca03df
2014-12-10 19:49:59 +00:00
Craig Mautner
7438b57c8d am 2de55513: Merge "Only one task within the stack should moveToBack"
* commit '2de55513f81b238ea42b2b36cbf61e8c1a475c45':
  Only one task within the stack should moveToBack
2014-12-10 17:57:34 +00:00
Craig Mautner
2de55513f8 Merge "Only one task within the stack should moveToBack" 2014-12-10 17:51:32 +00:00
Narayan Kamath
c46f75ef1d Avoid tearing down process groups twice.
The second removal always triggers a warning.

Change-Id: Ieafa8374dbffdaff0d576de004a688cae6f8ac18
2014-12-10 10:01:44 +00:00
Craig Mautner
74a6601360 am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."
* commit 'f71f5e8957aa2495a708ea1c8ca9e19d9e1f0003':
  [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
2014-12-09 16:39:08 +00:00
Craig Mautner
f71f5e8957 Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked." 2014-12-09 16:33:26 +00:00
Elliott Hughes
afc5b22c22 am da30b545: Merge "Fix typo."
* commit 'da30b545f93757d15e4ed58fe8946ada9d8cc3e0':
  Fix typo.
2014-12-09 16:11:01 +00:00
Elliott Hughes
da30b545f9 Merge "Fix typo." 2014-12-09 16:02:57 +00:00
Mark Lu
4b5a9a09e5 [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
Symptom:
in .ActivityStack.resetTargetTaskIfNeededLocked,  "allowTaskReparenting" if case will call setTask
to remove activities from task, that will caused numActivities in main for-loop not consist with task.mActivities size.
caused NPE will happend in finish activities for-loop due to get null object from activities when clearWhenTaskReset" as true case.

Root Cause:
when clearWhenTaskReset as true, will set "end" variable as numActivities -1, but if calling setTask to remove activities from task,
end value will out of date & not same with task.mActivities size.

Solution:
use activities.size() - 1 to assign end value.

Change-Id: I5d7fe22e1df2fc61738db23402e7c42cf6d8c4cc
2014-12-09 06:48:21 +00:00
Elliott Hughes
0adcf15ad8 Fix typo.
Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56
2014-12-08 20:50:00 -08:00
Mathieu Chartier
7a811fc7f2 am fb5c932d: Merge "Add more -d dalvik details to dumpsys"
* commit 'fb5c932dbbe2e7fc3ed4f0af71dc8ac76f22df57':
  Add more -d dalvik details to dumpsys
2014-12-09 02:25:45 +00:00
Mathieu Chartier
fb5c932dbb Merge "Add more -d dalvik details to dumpsys" 2014-12-09 02:05:45 +00:00
Mathieu Chartier
063028aa68 Add more -d dalvik details to dumpsys
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)
2014-12-08 17:33:56 -08:00
Dmitriy Ivanov
4fed05b4e6 am f0070999: Merge "Remove unsed check for simulator"
* commit 'f00709991dd13311054b78782de483b53941bcf8':
  Remove unsed check for simulator
2014-12-09 00:07:58 +00:00
Dmitriy Ivanov
f00709991d Merge "Remove unsed check for simulator" 2014-12-08 21:17:59 +00:00
Lajos Molnar
3547de2f15 am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate"
* commit '9d6fa062a55c17b7fa08707b1006e7295bf9bc0c':
  media: fix isSupportedFormat for integer frame rate
2014-12-08 18:07:56 +00:00
Lajos Molnar
f5375fbd8e am 38935e6e: Merge "media: allow full range of Vorbis sampling rates"
* commit '38935e6eafc90d491e3a02e15ebb0890b7731473':
  media: allow full range of Vorbis sampling rates
2014-12-08 18:07:49 +00:00
Lajos Molnar
9d6fa062a5 Merge "media: fix isSupportedFormat for integer frame rate" 2014-12-08 18:02:41 +00:00
Lajos Molnar
38935e6eaf Merge "media: allow full range of Vorbis sampling rates" 2014-12-08 18:02:18 +00:00
Narayan Kamath
5620604261 am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."
* commit 'bdc6cde725a6fdb1b6911c74f20a797df9672d7f':
  Fix PhoneStateListener constructor javadoc.
2014-12-08 13:43:15 +00:00
Narayan Kamath
bdc6cde725 Merge "Fix PhoneStateListener constructor javadoc." 2014-12-08 13:35:46 +00:00
Karol Wrótniak
69d3e55193 Fix PhoneStateListener constructor javadoc.
Removed sentence in visible javadoc of #PhoneStateListener() which
was useless because it referred to another hidden constructor.

Change-Id: I14a956ac29881000e48bf31e0090e9e1f93bf6e3
2014-12-08 13:13:24 +00:00
Bernhard Rosenkränzer
46c82b4cd2 Adjust format strings to work on both 32-bit and 64-bit builds
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds

Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-05 16:14:07 -08:00
Dmitriy Ivanov
4b58cda367 Remove unsed check for simulator
Change-Id: I46f134d960db330e7b6e7dbfebc84d602d3a3466
2014-12-05 14:08:04 -08:00
Adam Powell
b3b4f83702 am 8c9283f4: Merge "Fix NullPointerException in ListView"
* commit '8c9283f41083a20a82ae37eac44b79de6eb3158e':
  Fix NullPointerException in ListView
2014-12-05 19:32:13 +00:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Lajos Molnar
24ffac0135 MediaCodec/Image: handle null cropRect correctly
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image

Bug: 18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
2014-12-04 16:33:57 -08:00
Lajos Molnar
32d8cc1429 media: fix isSupportedFormat for integer frame rate
Bug: 18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
2014-12-04 16:29:30 -08:00
Lajos Molnar
cea639cf3f media: add support for 160-byte image info in MediaCodec
Some 64-bit compilers now create 160-byte image structures.

Bug: 18513091
Change-Id: I355714affaac0fde0b03578d13ab8f373dd5aa81
2014-12-04 16:28:33 -08:00
Lajos Molnar
0ca248599c media: allow full range of Vorbis sampling rates
Bug: 18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
2014-12-04 16:27:39 -08:00
Amith Yamasani
66cbec512c am d234dc1f: Merge "Correct check of is user running"
* commit 'd234dc1f20d3a68e0dd9f2c3a5f14282fba79b13':
  Correct check of is user running
2014-12-04 23:15:47 +00:00
Amith Yamasani
d234dc1f20 Merge "Correct check of is user running" 2014-12-04 23:09:48 +00:00
Mike Lockwood
75b2557725 am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"
* commit '448403b7a4b2126e79121482d1fb2894133dfa25':
  Dont call close in in BluetoothA2dp finalize
2014-12-04 21:49:56 +00:00
Mike Lockwood
448403b7a4 Merge "Dont call close in in BluetoothA2dp finalize" 2014-12-04 21:41:13 +00:00
Alex Klyubin
f162066db5 Remove DefaultHostnameVerifier from preloaded-classes.
libcore's DefaultHostnameVerifier no longer exists. See
https://android-review.googlesource.com/#/c/117453/.

Bug: 18481199
Change-Id: I5c07e058aaaf8531d420058cfd104c4e751757a3
2014-12-04 09:41:46 -08:00
Craig Mautner
6465980cd8 am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"
* commit 'e879b2ae69bf7ef159dbdc068423526d5db99df0':
  Prevent ANR when broadcast receiver is killed
2014-12-04 15:16:11 +00:00
Chih-hung Hsieh
0ebbfaedd7 am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"
* commit 'ccce6e0f9f6f4da95d61fb2cfb1253ac662fba30':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
2014-12-04 15:16:04 +00:00
Craig Mautner
e879b2ae69 Merge "Prevent ANR when broadcast receiver is killed" 2014-12-04 01:56:39 +00:00
Kenji Sugimoto
4472fa9780 Prevent ANR when broadcast receiver is killed
If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.

As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.

Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.

Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
2014-12-03 17:53:06 -08:00
Chih-hung Hsieh
ccce6e0f9f Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 2014-12-04 01:04:09 +00:00