11585 Commits

Author SHA1 Message Date
Dianne Hackborn
390517be2d Clean up some temporary allocations.
Yay to ArrayMap, letting me get rid of a bunch of temporary
iterators in core code paths like updateOomAdj.  (Now I definitely
need an ArraySet to finish that up.)

Also clean up various other things that are doing unnecessary
allocations, clean up some debug output, make more of the debug
output respect package filtering.

Change-Id: Ib4979faf4de8c7912739bc0937c3fa9e7bfcde67
2013-05-30 19:26:42 -07:00
Victoria Lease
51ff6f953c am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev
* commit 'd9f7250a1d53cf1be66fd20b95f1303abb1d2a10':
  break up LocationManagerService's WakeLock
2013-05-29 17:20:01 -07:00
Victoria Lease
a9770e4f06 break up LocationManagerService's WakeLock
This commit splits LocationManagerService's monolithic WakeLock into
per-LocationManagerService.Receiver WakeLocks, for better WorkSource
accounting. This should make it easier to debug location-related
power issues.

Change-Id: I0d2897c305a38099f9663dc1bc9354ce4bbe1077
(cherry picked from commit 0aa28602d51bf41e46d18ffefe724ebc3ff7a704)
2013-05-29 17:11:25 -07:00
Victoria Lease
c7546a504e Merge "break up LocationManagerService's WakeLock" 2013-05-30 00:08:13 +00:00
Victoria Lease
0aa28602d5 break up LocationManagerService's WakeLock
This commit splits LocationManagerService's monolithic WakeLock into
per-LocationManagerService.Receiver WakeLocks, for better WorkSource
accounting. This should make it easier to debug location-related
power issues.

Change-Id: I0d2897c305a38099f9663dc1bc9354ce4bbe1077
2013-05-29 16:18:28 -07:00
Romain Guy
c4ea109ba2 Merge "Disable the AssetAtlas when running under valgrind Bug #9191438" 2013-05-29 23:02:19 +00:00
Romain Guy
80b12fcaae Disable the AssetAtlas when running under valgrind
Bug #9191438

When running under valgrind, the ppid will be different from the ppid
of the system server (which always gets forked from zygote.)

Change-Id: I42cbf99fd0084aeab76c30de9beb7c49ed1fc7d8
2013-05-29 16:01:36 -07:00
Amith Yamasani
ce863c6fe1 am 096d3843: am 3ec14d9c: am 9b76b2d2: Merge "framework:base: iterator error in singletone provider"
* commit '096d3843994dfef99a2670c38d72c31e96cdad74':
  framework:base: iterator error in singletone provider
2013-05-29 15:25:44 -07:00
Amith Yamasani
3ec14d9cf1 am 9b76b2d2: Merge "framework:base: iterator error in singletone provider"
* commit '9b76b2d29fa338a128f699a1f40f7f5916a512af':
  framework:base: iterator error in singletone provider
2013-05-29 15:18:50 -07:00
Amith Yamasani
9b76b2d29f Merge "framework:base: iterator error in singletone provider" 2013-05-29 22:04:01 +00:00
Jun Su
cca0965a1b framework:base: iterator error in singletone provider
In case of singletone provider, we don't count it in the guset user.
After we remove it from the array, and resize the array, need to move
iterator back.

Change-Id: I99920a6beccc9de0e67ffeb632b1940efaee10b9
2013-05-29 14:33:59 +08:00
Dianne Hackborn
21d9b56692 Add more details about why a force stop is happening.
Change-Id: Ia938cf6fc37ad22fc7447dc538968c7bd234be7d
2013-05-28 17:46:59 -07:00
Andreas Huber
b54e0aa299 Merge "Fix parsing of global:http_proxy value." 2013-05-28 23:06:30 +00:00
Jeff Sharkey
2267a7862e am 2c4b0905: am ab4a0541: am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit '2c4b0905513b73c9e0435632cbaa00320480a857':
  Add missing ACTION_MEDIA_UNMOUNTED intent
2013-05-28 15:52:25 -07:00
Jeff Sharkey
ab4a054199 am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"
* commit 'e4c29de9c69d332d65d2eb490961faffab4467fd':
  Add missing ACTION_MEDIA_UNMOUNTED intent
2013-05-28 15:46:08 -07:00
John Spurlock
883ffa243d Merge "Hideybars feature confirmation toast bar." 2013-05-28 22:23:17 +00:00
Andreas Huber
7b8e1ea139 Fix parsing of global:http_proxy value.
This caused a runtime restart for ':' and did not disable the proxy for ""
before.

Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f
2013-05-28 15:17:37 -07:00
Dianne Hackborn
525862c776 am 66e596e7: am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '66e596e788761e1168805304d2f5fc93c1f2fbcd':
  Fix wrong log information in DevicePolicyManagerService
2013-05-28 13:50:05 -07:00
Maunik Shah
46c94b6626 DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition
Fix for the synchronization issue leading to access of an array
Index out of bounds. Issue occurs due to race condition between
removing the activities of a crashed process from history stack
and resuming a separate activity.

Change-Id: I14bb5834e778c15b674248e46fe93b0ce9f37967
2013-05-28 13:46:24 -07:00
Jeff Sharkey
e4c29de9c6 Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 2013-05-28 20:44:47 +00:00
John Spurlock
dcf4f21460 Hideybars feature confirmation toast bar.
Enhance Toast to support new standard toast bar style, similar
to the undo bar in Gmail.  Toast bars can be interactive,
and can have a single action.  Add a new toast duration to
indicate persistent toasts (no auto-hide delay).

Use the new toast bar to implement a feature hint when hiding
the navigation bar in hideybars mode.

Per UX, the feature confirmation bar can also be dismissed on
any outside touch as long as the user confirmed it using the
OK button at least once globally.

Bug: 8754108
Change-Id: Iaa85d3b4da7ada1952a562f1e31de04380f5d587
2013-05-28 13:09:23 -04:00
Craig Mautner
41c0f353c6 Replace mFocusedStack with getFocusedStack()
mFocusedStack should not be used directly as it may be null. Added
a note to the declaration to remind future self of that.

Fixes bug 9165949.

Change-Id: I8fad428d93b50909be9e7ec51df81149c11313b3
2013-05-28 08:39:25 -07:00
Dianne Hackborn
840f114395 am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"
* commit '7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
  Fix wrong log information in DevicePolicyManagerService
2013-05-26 00:23:28 -07:00
Dianne Hackborn
7f3ff133c1 Merge "Fix wrong log information in DevicePolicyManagerService" 2013-05-26 07:22:21 +00:00
Dianne Hackborn
087384b0af am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
  Framework/base: Added synchronization block to avoid race condition
2013-05-26 00:02:24 -07:00
Dianne Hackborn
f325103356 Merge "Framework/base: Added synchronization block to avoid race condition" 2013-05-26 06:30:26 +00:00
Dianne Hackborn
2e39f5c5cb Merge "New ArrayMap class." 2013-05-24 23:37:16 +00:00
Dianne Hackborn
f4bf0ae2a7 New ArrayMap class.
This is a new kind of key/value mapping that stores its data
as an array, so it doesn't need to create an extra Entry object
for every mapping placed in to it.  It is also optimized to reduce
memory overhead in other ways, by keeping the base object small,
being fairly aggressive about keeping the array data structures
small, etc.

There are some unit and performance tests dropped in to some
random places; they will need to be put somewhere else once I
decided what we are going to do with this for the next release
(for example if we make it public the unit tests should go in
to CTS).

Switch IntentResolver to using ArrayMap instead of HashMap.

Also get rid of a bunch of duplicate implementations of binarySearch,
and add an optimization to the various sparse arrays where you can
supply an explicit 0 capacity to prevent it from doing an initial
array allocation; use this new optimization in a few places where it
makes sense.

Change-Id: I01ef2764680f8ae49938e2a2ed40dc01606a056b
2013-05-24 16:36:14 -07:00
Craig Mautner
18f8530486 Merge "Convert API refs to StackBox from ActivityStack." 2013-05-24 23:14:52 +00:00
Craig Mautner
5a449154d1 Convert API refs to StackBox from ActivityStack.
- Removed IActivityManager.getStacks() since getStackBoxes() is better.
- Made createStacks operate relative to StackBox instead of TaskStack.
- Made resizeStack into resizeStackBox.

Change-Id: I7a0e1f4e34f399b4fd1180c60cc3989f9c2433f3
2013-05-24 16:12:57 -07:00
Robert Greenwalt
5dcca2edc9 am f2eb6fbc: am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
* commit 'f2eb6fbc0a9d000a2037d69e381c0784ccb847af':
  Use the old interface when resetting connections
2013-05-24 13:02:01 -07:00
Craig Mautner
8cec2bcef9 Merge "Add retrieval of StackBox info for more flexibility" 2013-05-24 19:54:18 +00:00
Craig Mautner
5ff1210172 Add retrieval of StackBox info for more flexibility
First step in permitting StackBoxes to be manipulated by user.
Necessary for Configuration changes coming down.

Change-Id: I4029926a35e4fdc59a5759fd9e4bae10bb308413
2013-05-24 12:50:15 -07:00
Dianne Hackborn
64770d16b0 Some improvements to meminfo output.
- Rename "Swappable PSS" to "PSS Clean" which I think is what it
  means and is consistent with the other memory metrics.
- Split at the top level the dalvik heap from other dalvik allocations,
  so when you look on the dalvik allocations line things are consistent
  with the allocator's data and it is clear what are app allocations vs.
  other data in dalvik.
- Don't print lines that are all 0.
- Don't print the detailed Dalvik allocation data by default; add a new
  option to have it printed.

Here's what a typical system process dump now looks like:

** MEMINFO in pid 6358 [system] **
                   Pss      Pss   Shared  Private   Shared  Private     Heap     Heap     Heap
                 Total    Clean    Dirty    Dirty    Clean    Clean     Size    Alloc     Free
                ------   ------   ------   ------   ------   ------   ------   ------   ------
  Native Heap        0        0        0        0        0        0     6964     3599     2048
  Dalvik Heap     7541        0     4344     7356        0        0    11768    11194      574
 Dalvik Other     3553        0     2792     3448        0        0
        Stack       28        0        8       28        0        0
       Cursor        4        0        0        4        0        0
       Ashmem        5        0       12        0        0        0
    Other dev     4004        0       24     4000        0        4
     .so mmap     3959      684     2500     2280     5468      684
    .apk mmap      173       68        0        0      692       68
    .dex mmap     4358     3068        0        0     9276     3068
   Other mmap       60        0        8        8      244       36
      Unknown     4387        0      508     4380        0        0
        TOTAL    28072     3820    10196    21504    15680     3860    18732    14793     2622

 Objects
               Views:       10         ViewRootImpl:        1
         AppContexts:        8           Activities:        0
              Assets:        3        AssetManagers:        3
       Local Binders:      176        Proxy Binders:      341
    Death Recipients:      141
     OpenSSL Sockets:        0

 SQL
         MEMORY_USED:      473
  PAGECACHE_OVERFLOW:       98          MALLOC_SIZE:       62

 DATABASES
      pgsz     dbsz   Lookaside(b)          cache  Dbname
         4       68             49         7/21/7  /data/data/com.android.providers.settings/databases/settings.db
         4       20             17         0/13/1  /data/system/locksettings.db
         4       20             21        96/14/2  /data/system/locksettings.db (1)
         4       20             21        75/13/2  /data/system/locksettings.db (2)
         4       80             29         4/17/3  /data/system/users/0/accounts.db

Change-Id: Ifd511a7baaa8808f82f39509a5a15c71c41d1bac
2013-05-24 10:47:03 -07:00
Robert Greenwalt
f2eb6fbc0a am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections
2013-05-24 09:24:32 -07:00
Robert Greenwalt
36a151abcd Merge "Use the old interface when resetting connections" into jb-mr2-dev 2013-05-24 16:21:35 +00:00
Robert Greenwalt
80eb63b58b Use the old interface when resetting connections
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
2013-05-23 18:33:06 -07:00
Andrew Wilson
d078990429 am f25b876c: am 55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
* commit 'f25b876c8d0a8abb235d6509ceaad218240fca46':
  Compare binder instances when checking if listeners match.
2013-05-23 13:10:51 -07:00
Andrew Wilson
f25b876c8d am 55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
* commit '55bf965e89df5986a7a988c2b1ec2cd9f01edb56':
  Compare binder instances when checking if listeners match.
2013-05-23 13:08:04 -07:00
Andrew Wilson
55bf965e89 Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev 2013-05-23 18:47:48 +00:00
Amith Yamasani
9a6d5fc5a1 am 77049e13: am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
* commit '77049e1303bba3056c4a1353d3c03421d0ba27f7':
  Fix account filtering for specific package name
2013-05-23 07:43:14 -07:00
Amith Yamasani
77049e1303 am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
* commit '60b4afedbeea11983b748d0d8ea9032d177dd6e7':
  Fix account filtering for specific package name
2013-05-23 07:41:09 -07:00
Amith Yamasani
e342309704 Fix account filtering for specific package name
Hacks to enable gms to see accounts were interfering with checking for
explicit package name.

Bug: 9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a
2013-05-22 19:41:45 -07:00
Craig Mautner
6d90fed076 Add stackId to RecentTaskInfo
Necessary for multi-stack activity overview.

Fixes bug 9092356.

Change-Id: I3d51a7b5cbca6166017759401bb5d31b4ae96f07
2013-05-22 17:23:25 -07:00
Craig Mautner
9d851de6cc Revert "Add stackId to RecentTaskInfo"
Need to modify the API as well.
This reverts commit b9b9477581ce5f72a679dd1cd9a85e6c8f73944a

Change-Id: I34ea371408930b6b1bf4c53ad9ab8418b0070dbc
2013-05-22 23:14:05 +00:00
Craig Mautner
b9b9477581 Add stackId to RecentTaskInfo
Necessary for multi-stack activity overview.

Fixes bug 9092356.

Change-Id: I91fc68ebf72114224c8e651261101ac14517ff86
2013-05-22 15:03:10 -07:00
Daniel Sandler
ffcc976928 Temporarily restore some support for icon==0 notifications.
This is WRONG WRONG WRONG but certain apps rely on it to
poke the LED and so forth. In a future release this will
stop working.

Bug: 8623399
Change-Id: I49bb8ccc6891b1398ceec94c64d6c3a510ad1c38
2013-05-22 15:04:00 -04:00
Andrew Wilson
152942be13 Compare binder instances when checking if listeners match.
Bug: 9069919
Change-Id: I06130105cb703de35de76ab2fceba3855fa5407a
2013-05-22 09:35:35 -07:00
Robert Greenwalt
11f33b50bb am 657eb614: am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev
* commit '657eb614ef0d5b56dfbfe3669db18f5a59b57c29':
  Don't put up wifi-available note when disabled
2013-05-21 12:58:00 -07:00
Robert Greenwalt
657eb614ef am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev
* commit '4c32885c4249be9b0a9e674b96ebacc78152b47e':
  Don't put up wifi-available note when disabled
2013-05-21 12:56:04 -07:00