11711 Commits

Author SHA1 Message Date
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
Robert Greenwalt
4c32885c42 Merge "Don't put up wifi-available note when disabled" into jb-mr2-dev 2013-05-21 19:54:39 +00:00
Robert Greenwalt
8c77692554 Don't put up wifi-available note when disabled
With the new scan-always mode we will get scan results when disabled.
Don't tell the user about open AP when they've turned off wifi.

bug:9067982
Change-Id: I7a303c2a6f87a331443eeb54fa8ff5b467c0a1ff
2013-05-21 11:17:11 -07:00
Daniel Sandler
75c501747e am 99d1f7f4: am f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
* commit '99d1f7f41e79157ca61b14a1d61d29b5f51efc73':
  Archive a copy of each dismissed notification.
2013-05-21 10:39:02 -07:00
Daniel Sandler
99d1f7f41e am f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
* commit 'f5ceaf4b19362b3cf7882bf8a6d086841f551fed':
  Archive a copy of each dismissed notification.
2013-05-21 10:37:27 -07:00
Daniel Sandler
f5ceaf4b19 Merge "Archive a copy of each dismissed notification." into jb-mr2-dev 2013-05-21 17:35:17 +00:00
Daniel Sandler
26b81d594c Archive a copy of each dismissed notification.
We don't want to save all the heavyweight stuff, but we
can't lighten the notification in place because there may be
other active references.

Bug: 8839246
Change-Id: Id6dcc1cf5ae196ee3e42908d6b3ec4e928e9f0c5
2013-05-21 00:58:32 -04:00
Dianne Hackborn
77f342c37c Merge "Add app ops for wake locks." 2013-05-21 00:54:07 +00:00
Dianne Hackborn
713df150b9 Add app ops for wake locks.
Currently only supports auditing, not disabling.

Change-Id: Ie85f02c29b490d96e073f54d59e165d48c7c00c9
2013-05-20 16:49:46 -07:00
Svetoslav Ganov
18117c2f2c am 20b3b743: am 507bd53a: Merge "Do not report the fake UI automation service to clients." into jb-mr2-dev
* commit '20b3b743c0871d4ac88f61ca6b3509d01d406b22':
  Do not report the fake UI automation service to clients.
2013-05-20 16:42:34 -07:00
Robert Greenwalt
9af2fc5bd2 am 8ff86240: am b11672de: Merge "Add a time margin for deferred enable." into jb-mr2-dev
* commit '8ff86240dc49c1b863154aea6b2e1fd07cfd04b6':
  Add a time margin for deferred enable.
2013-05-20 16:39:10 -07:00
Svetoslav Ganov
20b3b743c0 am 507bd53a: Merge "Do not report the fake UI automation service to clients." into jb-mr2-dev
* commit '507bd53aa8906f7f3297684edb485706a4a573a1':
  Do not report the fake UI automation service to clients.
2013-05-20 16:38:20 -07:00
Svetoslav Ganov
507bd53aa8 Merge "Do not report the fake UI automation service to clients." into jb-mr2-dev 2013-05-20 23:36:41 +00:00
Robert Greenwalt
8ff86240dc am b11672de: Merge "Add a time margin for deferred enable." into jb-mr2-dev
* commit 'b11672de5272f6dcf7e8f4a9d88f2925cdc4c2dd':
  Add a time margin for deferred enable.
2013-05-20 16:34:54 -07:00
Satoshi Kataoka
c6f7a7ff88 Merge "A tiny cleanup as the supplement of I9b5ef954479150bc4735 Bug: 3483284 Bug: 8851603" 2013-05-20 21:32:03 +00:00
Satoshi Kataoka
12afe1450e A tiny cleanup as the supplement of I9b5ef954479150bc4735
Bug: 3483284
Bug: 8851603

Change-Id: Ia6dd894dced9cc68c04aafdcae754a404cf52e83
2013-05-21 06:19:27 +09:00
Satoshi Kataoka
f1a6d646a4 Merge "Fix a bug on the focus of the input method switching dialog" 2013-05-20 21:11:47 +00:00
Satoshi Kataoka
02679f647b Fix a bug on the focus of the input method switching dialog
Bug: 8851603
Change-Id: I9b5ef954479150bc47351197c792fb96aba70d01
2013-05-21 05:59:56 +09:00
Craig Mautner
b3b36ba138 Resize all changed windows and fix moveTaskToStack
- Add all changing windows to mResizingWindows when an ActivityStack
is resized.

- Stop calling TaskStack.setBounds if the bounds haven't changed.

- Make moving a task from one stack to another work properly.

- Eliminate unused methods and redundant variables in WindowState and
WindowStateAnimator.

Change-Id: I3a950c777bcc50cdeced150d44423d4d0b38af4a
2013-05-20 13:25:14 -07:00
Craig Mautner
f7bfefb598 Reformat wrapped lines and merge sendMessages.
Change-Id: I2834966196c2e6a778fc0cb71e4a56411b24c3f0
2013-05-20 13:25:14 -07:00
Robert Greenwalt
e47d7d4380 Add a time margin for deferred enable.
We were getting delayed message delivered 1 ms before we expected.
bug:9014777

Change-Id: I70e681ff6b4155d31097b43529478b39c816e70b
2013-05-20 11:49:46 -07:00
Robert Greenwalt
e0fc187549 am dfbf9901: am 5c11e8ee: Fix off-by-1 error in timing
* commit 'dfbf9901b4c16c6f7658d3e8bdb1573886c927e4':
  Fix off-by-1 error in timing
2013-05-20 09:44:42 -07:00
Robert Greenwalt
dfbf9901b4 am 5c11e8ee: Fix off-by-1 error in timing
* commit '5c11e8ee5463b88907814e3e8716af292f90fb86':
  Fix off-by-1 error in timing
2013-05-20 09:43:17 -07:00