drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,146 Commits 1 Branch 0 Tags
Commit Graph

159146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
32d8cc1429 media: fix isSupportedFormat for integer frame rate 
Bug: 18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
 2014-12-04 16:29:30 -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
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
Adam Lesinski
503071ae41 am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit 'a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b':
  RRO: prevent duplicate system overlays
 2014-12-03 17:49:12 +00:00
Adam Lesinski
a2b5067aee Merge "RRO: prevent duplicate system overlays" 2014-12-03 17:44:18 +00:00
Sergii Skorokhodov
9edcc7be49 Correct check of is user running 
Before the ActivityManagerService sends an intent or
starts an activity it checks if target user is in
mStartedUsers array.

When removing a non-owner user process the
UserStartedState instance will still be in mStartedUsers
array with mState STOPPING or SHUTDOWN.

This should be checked before sending an intent or start
an activity.

isUserRunningLocked(...) will interpret mState STOPPING
and SHUTDOWN as a non running user.

Change-Id: I1b51bcdb62bdd0f6dbe05dab4d529d4ad40d0d44
 2014-12-03 08:36:26 +01:00
Jason Sams
b940599a75 am abdaa32d: Merge "Fix bug in passing of context flags and version." 
* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
  Fix bug in passing of context flags and version.
 2014-12-02 23:52:12 +00:00
Jason Sams
abdaa32dd7 Merge "Fix bug in passing of context flags and version." 2014-12-02 23:45:17 +00:00
Adam Lesinski
e580d6617f am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e89a286541e242ad96705fcdd1fe2c6a9eafb4a0':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:00:06 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c 
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 22:52:37 +00:00
Chris Wren
47a5cb122a am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes" 
* commit 'acd01ff07668a608cb4890a2ea1533a2397149c8':
  Keep deleteIntent when copying Notification attributes
 2014-12-02 22:38:28 +00:00
Chris Wren
acd01ff076 Merge "Keep deleteIntent when copying Notification attributes" 2014-12-02 22:31:09 +00:00
Jason Sams
81cd2b18bd Fix bug in passing of context flags and version. 
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
 2014-12-02 12:37:04 -08:00
Alan Viverette
850cdbe58c am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 
* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
  Consider RTL layout in DPAD navigation in AbsSeekBar
 2014-12-02 19:36:03 +00:00
Alan Viverette
71c5d62d96 Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 2014-12-02 19:21:22 +00:00
Craig Mautner
877d89399a am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection" 
* commit 'f6be7d177a740f86a4ae3b8685cc9e2f31506352':
  [ActivityManager] Fix race condition in pss collection
 2014-12-02 19:05:01 +00:00