Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

23991 Commits

Author SHA1 Message Date
Craig Mautner
38b5d057f0 am 93c5cf6a: am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '93c5cf6a6fc928dbfd4426b7bd0c7731bfac0ed2':
  Only one task within the stack should moveToBack
 2014-12-10 21:57:22 +00:00
Amith Yamasani
e289aafae9 am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 automerge: 7acd880 
* commit 'f1ffc75c9ec093ff780954f86c72a8a7069ca6cf':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 21:32:57 +00:00
Nick Kralevich
7668e78601 resolved conflicts for merge of 3bae94d7 to master 
Change-Id: I381539b1494447d62290c492f2550840fe0b559c
 2014-12-10 11:03:40 -08:00
Craig Mautner
93c5cf6a6f am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '7438b57c8d1e1649c51c570fe71aef861854730d':
  Only one task within the stack should moveToBack
 2014-12-10 18:04:52 +00:00
Craig Mautner
2de55513f8 Merge "Only one task within the stack should moveToBack" 2014-12-10 17:51:32 +00:00
Wale Ogunwale
dc101a11df Always take an activity screenshot when pausing. automerge: 37f2718 
automerge: bfa6059

* commit 'bfa6059b78dfe0a40e71df055c60e431478a3e9d':
  Always take an activity screenshot when pausing.
 2014-12-10 01:00:52 +00:00
Wale Ogunwale
bfa6059b78 Always take an activity screenshot when pausing. 
automerge: 37f2718

* commit '37f271869ed9c9e9f0e7de7339017e0bb6719780':
  Always take an activity screenshot when pausing.
 2014-12-10 00:57:51 +00:00
Wale Ogunwale
37f271869e Always take an activity screenshot when pausing. 
http://ag/261732 introduced an optimization where we only take
the activity screenshot if is is not the activity we took a
screenshot for last. This causes us to display a stale screenshot
for activities that change their display content (using fragments)
without going through the pause/resume cycle. It should be safe
to always take a screenshot when we are pausing since the code
path is only called once per pause/resume cycle.

Bug: 18682160
Change-Id: Ie5c43cfd806286808af4233c5917ae7071908ebb
(cherry picked from commit eacdf2ce04)
 2014-12-10 00:44:28 +00:00
Amith Yamasani
f1ffc75c9e Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 
automerge: 7acd880

* commit '7acd8802d7c14323dfc2a5e68b1d2a82f9d3f5c0':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:35:52 +00:00
Amith Yamasani
7acd8802d7 Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 
automerge: dad85a6

* commit 'dad85a6c4bf51c126978d584703a5320be7f396c':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:33:24 +00:00
Amith Yamasani
dad85a6c4b Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 2014-12-10 00:30:31 +00:00
Wale Ogunwale
c73923bcf9 Merge "Always take an activity screenshot when pausing." 2014-12-10 00:09:15 +00:00
Adrian Roos
0b85b9d267 am 9c69c319: am 87427ce5: am 456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev 
* commit '9c69c3199637d33d2db754f53a3f3161b7df7153':
  Revert "Fix calculation of overscan insets in WindowState."
 2014-12-09 23:48:16 +00:00
Jeff Sharkey
1ca0ea6b7c am b97633c1: am 5d662a82: am 2f4ced30: Merge "Consistent result when signatures don\'t match." into lmp-mr1-dev 
* commit 'b97633c14da555d89dac7eadbf6e351d82281614':
  Consistent result when signatures don't match.
 2014-12-09 23:46:59 +00:00
Craig Mautner
0360f2a158 am 40c5c0ef: am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked." 
* commit '40c5c0ef16462668fb13717f59254f8696eac127':
  [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
 2014-12-09 23:46:49 +00:00
John Reck
3bae94d78e resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp 
Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b
 2014-12-09 15:38:38 -08:00
Sebastien Hertz
dde13b3714 am 70acd9b3: resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
* commit '70acd9b36a9fc0d212b25d64f4edf0fc582331cf':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 23:23:36 +00:00
Santos Cordon
8c07abe220 am 02775fca: am 8dd185b0: am 5d2c1e69: (Telecom-system part 3) Adding Telecom Loader Service 
* commit '02775fca2b78af8089e9f50575ca639898f4f21c':
  (Telecom-system part 3) Adding Telecom Loader Service
 2014-12-09 23:20:31 +00:00
Jeff Sharkey
dc460d3512 am ea06d6ce: am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev 
* commit 'ea06d6ceb70a0a091cae674bb7296bb470f7e594':
  Direct notification of network interface changes.
 2014-12-09 23:20:26 +00:00
Jinsuk Kim
5f9e85af7b am 1365a398: am 19e53e9c: am c414f466: Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev 
* commit '1365a3985d961adbe36d12bf3ebff82e30243d74':
  CEC: Explictly remove and add device when updating
 2014-12-09 23:20:16 +00:00
John Reck
fe11126d23 am 4f1942d9: Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 
* commit '4f1942d999c60fd91cb826651b6d978d47a74321':
  Teach AssetAtlas about more drawables
 2014-12-09 23:18:08 +00:00
John Reck
4f1942d999 Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev 2014-12-09 23:12:42 +00:00
Jeff Sharkey
a9f6048a94 am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 
* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
  Offer to "merge" subscribers for data usage.
 2014-12-09 22:23:19 +00:00
John Spurlock
089c6d79e3 am ef10307e: am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit 'ef10307e4a4942c5867ba696e12e13556ac7a716':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-09 22:23:04 +00:00
Jinsuk Kim
4e7d43e14c am ec3f3244: am 33697d85: am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev 
* commit 'ec3f3244ae5b995fa981a216da3c21d387fb050a':
  CEC: Update CEC device info properly
 2014-12-09 22:22:52 +00:00
Zoltan Szatmary-Ban
d00c3752e6 am 32ed193b: am f5e44c29: am c5c93edd: Merge "When switching to default USB function set, check restriction" into lmp-mr1-dev 
* commit '32ed193bb5396451401e62493f83664da9228729':
  When switching to default USB function set, check restriction
 2014-12-09 22:22:17 +00:00
Jinsuk Kim
4def188700 am 4fffb748: am 0cc53a5b: am 15556bbb: Merge "CEC: Disable debug logging" into lmp-mr1-dev 
* commit '4fffb7484755e3599099aacd9771b0b4e080242c':
  CEC: Disable debug logging
 2014-12-09 22:22:13 +00:00
John Reck
dad7d84c04 Teach AssetAtlas about more drawables 
Bug: 18317479

Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
 2014-12-09 14:18:33 -08:00
Wale Ogunwale
eacdf2ce04 Always take an activity screenshot when pausing. 
http://ag/261732 introduced an optimization where we only take
the activity screenshot if is is not the activity we took a
screenshot for last. This causes us to display a stale screenshot
for activities that change their display content (using fragments)
without going through the pause/resume cycle. It should be safe
to always take a screenshot when we are pausing since the code
path is only called once per pause/resume cycle.

Bug: 18682160
Change-Id: Ie5c43cfd806286808af4233c5917ae7071908ebb
 2014-12-09 14:02:27 -08:00
Amith Yamasani
0d2ebc2968 Allow user shutdown broadcasts to be delivered 
Fixes a regression that prevents the user from being fully shutdown
after being stopped. Wasn't killing all user processes.

Bug: 7462778
Change-Id: Iee7231f7c8a167e8a61549b149294b2dbef071c1
 2014-12-09 12:36:57 -08:00
Adrian Roos
9c69c31996 am 87427ce5: am 456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev 
* commit '87427ce5035e860b5d90e8a1788ee44e31bec504':
  Revert "Fix calculation of overscan insets in WindowState."
 2014-12-09 18:48:16 +00:00
Adrian Roos
87427ce503 am 456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev 
* commit '456e66749191bc2b6f1acb69a2b86f499a6ca73a':
  Revert "Fix calculation of overscan insets in WindowState."
 2014-12-09 18:42:56 +00:00
Adrian Roos
456e667491 Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev 2014-12-09 18:34:53 +00:00
Jeff Sharkey
b97633c14d am 5d662a82: am 2f4ced30: Merge "Consistent result when signatures don\'t match." into lmp-mr1-dev 
* commit '5d662a828935399e11723d0a5e7ff31c433e8b39':
  Consistent result when signatures don't match.
 2014-12-09 17:22:12 +00:00
Jeff Sharkey
5d662a8289 am 2f4ced30: Merge "Consistent result when signatures don\'t match." into lmp-mr1-dev 
* commit '2f4ced3009e1aa59f7b05a3663bc6ca6fe0a208e':
  Consistent result when signatures don't match.
 2014-12-09 17:14:47 +00:00
Jeff Sharkey
2f4ced3009 Merge "Consistent result when signatures don't match." into lmp-mr1-dev 2014-12-09 17:10:12 +00:00
Craig Mautner
40c5c0ef16 am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked." 
* commit '74a660136096d0ab10fe8d0f99c63ef535aa5552':
  [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
 2014-12-09 16:45:53 +00:00
Adrian Roos
3236f3a93a Revert "Fix calculation of overscan insets in WindowState." 
This reverts commit ff778fe450.

Bug: 18659737
Change-Id: I1efc59edfb8ded946cc14f5c4d6f532ac291bd81
 2014-12-09 15:06:40 +00:00
Wonsik Kim
6573fd535e am a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev 
* commit 'a565716a2a26c7522dabfb28f646508cc1928053':
  TIF: TvInputHardwareManager to listen to volume changes
 2014-12-09 11:06:16 +00:00
Sebastien Hertz
70acd9b36a resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
 2014-12-09 10:16:46 +01: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
Mike Lockwood
ae13230b87 Merge "MIDI: API changes to support multiple ports per device" 2014-12-09 02:37:40 +00:00
Dianne Hackborn
beb84982a1 am 8b33cf4d: Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
* commit '8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 01:57:26 +00:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode 
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
 2014-12-08 17:43:31 -08:00
Mike Lockwood
b6b9a91c02 MIDI: API changes to support multiple ports per device 
Add MidiInputPort and MidiOutputPort classes (with MidiPort base class)
A MidiDevice can now have multiple input and output ports.
Multiple ports are currently supported only for virtual devices, USB support coming later.

Change-Id: Ib55076aa1374aa46ae4ae76ad93bd717df6d7e21
 2014-12-08 17:09:14 -08:00
Jinsuk Kim
7822e6437a am 62bb43db: am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 
* commit '62bb43dbec930b7a4dc2272d8ed4da73d9aef8b1':
  CEC: Avoid setting op in disabled mode
 2014-12-09 01:00:50 +00:00
Jeff Davidson
4520f656f1 am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit '0efd29fc57c7369e2371aa3226e90f97331f517a':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-09 01:00:34 +00:00
Jeremy Joslin
902cc578a4 am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit 'd4753450f37d88fec11d1405250529ca794ae70c':
  Don't send the same PendingIntent more than once.
 2014-12-09 01:00:09 +00:00
Paul Jensen
64a3ba3f2e am 446a59bc: am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit '446a59bc26ffab59e05bb0967bb27758170dbcf5':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-09 01:00:00 +00:00