14750 Commits

Author SHA1 Message Date
Craig Mautner
f420a76e62 am c96218a0: am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev
* commit 'c96218a0575f7f5816104d38365c68a21c7b9ea6':
  Ensure that activities behind keyguard are paused.
2013-09-24 10:22:22 -07:00
Dianne Hackborn
9ef68ecda5 am 8d4816d8: am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev
* commit '8d4816d8fc9c1acbf377e7ee50b9871c4b5b8028':
  Issue #10461551: KLP API Review: AppOpsManager
2013-09-23 19:04:00 -07:00
Craig Mautner
c96218a057 am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev
* commit 'e14d0c211fb669f88c284af85c942135e834e498':
  Ensure that activities behind keyguard are paused.
2013-09-23 18:59:05 -07:00
Matthew Williams
05b51688f6 am 75256476: Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev
* commit '75256476c87cc8c4f7e5124c9b944c37b2f51d3d':
  fix deadlock caused by clearAllBackoffs in SSE
2013-09-23 18:58:55 -07:00
Dianne Hackborn
8d4816d8fc am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev
* commit 'a3abca90aea1b0b6ab0be56b3ec008b91dfc090f':
  Issue #10461551: KLP API Review: AppOpsManager
2013-09-23 18:58:42 -07:00
Craig Mautner
e14d0c211f Merge "Ensure that activities behind keyguard are paused." into klp-dev 2013-09-23 17:46:30 +00:00
Matthew Williams
75256476c8 Merge "fix deadlock caused by clearAllBackoffs in SSE" into klp-dev 2013-09-23 17:35:16 +00:00
Dianne Hackborn
a3abca90ae Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 2013-09-23 16:36:29 +00:00
Dianne Hackborn
9bb0ee9131 Issue #10461551: KLP API Review: AppOpsManager
Changed public constants from integers to strings.  Internally
everything is still integers, since we want that more efficient
representation for most things.

Changed the Callback interface to OnOpChangedListener.  We also
have a private versin that again takes an int, and tricks to
make both work.

Reworked the class documentation to be appropriate to the SDK
(as much as it can be); most of the existing documentation is
moved to the private implementation.  Also added documentation
of the MODE constants.

Change-Id: I4f7e73cc99fe66beff9194e960e072e2aa9458f8
2013-09-23 09:35:21 -07:00
Craig Mautner
10385a17cb Ensure that activities behind keyguard are paused.
TLDR: Having a resumed activity behind keyguard can cause the keyguard
not to be dismissed.

Swiping the home button to launch Google Now causes an ASSIST intent
to be launched. The ASSIST intent starts SearchActivity which then
launches GEL. If an activity is resumed behind the keyguard when this
happens then that activity will be paused.

Because that activity is PAUSING, ActivityStackSupervisor
startActivityLocked() doesn't call dismissKeyguard() immediately.
Instead dismissKeyguard will be called later when GEL switches from
not-visible to visible. However, if the paused activity happens to be
GEL then there is never a not-visible to visible transition and
dismissKeyguard never gets called.

This fix removes an unnecessary call to resumeTopActivitiesLocked
which was causing activities behind the lockscreen to be resumed.

This fixes bug 10732489 except immediately after boot. Pausing the
initial activity if the lockscreen is visible after boot is deferred
for another CL.

Change-Id: I323262596ae41bc5a2700bae5942f6a4fba80936
2013-09-23 09:05:15 -07:00
Dianne Hackborn
bf00b1a5f8 am eafa9c2b: am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev
* commit 'eafa9c2b893a9c98d4bf8086b32aabc05181791a':
  Debug issue #10876433 java.lang.IllegalStateException...
2013-09-22 16:53:10 -07:00
Dianne Hackborn
eafa9c2b89 am f9b70ab8: Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev
* commit 'f9b70ab87e8f26b57ac3d8dc3b77052e747cb888':
  Debug issue #10876433 java.lang.IllegalStateException...
2013-09-22 16:50:38 -07:00
Dianne Hackborn
2be0093316 Debug issue #10876433 java.lang.IllegalStateException...
...in ActivityManagerService.updateLruProcessInternalLocked on bluetooth

Add more debug output to help track down what is going on.

Also fix a little problem where, when a service ANRs, if you ask to
wait and it still wasn't responding, the ANR dialog wouldn't be
shown again.

Change-Id: I5be2b1705a0a39ca2992624ae683945c5f38065d
2013-09-22 16:46:00 -07:00
Robert Greenwalt
7dadd1ed2f am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev
* commit '1e690b693c2d4ee7ba04d5882f6b5889ada07e0a':
  Fix BatchScan request coalesing
2013-09-22 09:03:20 -07:00
Robert Greenwalt
1e690b693c am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev
* commit '0983eadff23bfc3ab7812be455d4a66edc3dcc7b':
  Fix BatchScan request coalesing
2013-09-22 09:01:43 -07:00
Robert Greenwalt
0983eadff2 Merge "Fix BatchScan request coalesing" into klp-dev 2013-09-22 15:59:01 +00:00
Dianne Hackborn
04cca35b85 resolved conflicts for merge of cc585f86 to master
Change-Id: I72aa7707edeb48f63fbe5348915a31650bdfd8f5
2013-09-20 19:04:45 -07:00
Dianne Hackborn
cc585f86bc am 88b6e69b: Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev
* commit '88b6e69bc7007964f9ae4f30faf1bb59d6a702bb':
  Fix issue #10863270: procstats UI is showing all green
2013-09-20 18:53:37 -07:00
Dianne Hackborn
88b6e69bc7 Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev 2013-09-21 01:52:04 +00:00
Dianne Hackborn
2610b7cb2a Fix issue #10863270: procstats UI is showing all green
Gah I messed up when refactoring so it would always be told
RAM is low.

Also slightly tune the low memory parameters to go into low
memory states a bit more aggressively.

Change-Id: I5f970349760ad349d515a85c266ab21b387ee353
2013-09-20 18:51:03 -07:00
Dianne Hackborn
05a3413998 am ff7f43eb: am bb6fd7ff: Merge "Shut. Up." into klp-dev
* commit 'ff7f43eb08e3f2d98e7b8f09e733ef015e3fe168':
  Shut.  Up.
2013-09-20 18:30:47 -07:00
Dianne Hackborn
ff7f43eb08 am bb6fd7ff: Merge "Shut. Up." into klp-dev
* commit 'bb6fd7ff8cec893999b26e39dc62f1b4b4b9a8ea':
  Shut.  Up.
2013-09-20 18:29:16 -07:00
Dianne Hackborn
bb6fd7ff8c Merge "Shut. Up." into klp-dev 2013-09-21 01:25:18 +00:00
Svetoslav
69337346ab am 939d9592: am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev
* commit '939d95924a88f4376f301db72b95e096f69fda7f':
  Offer to enable a print service after it is installed.
2013-09-20 18:23:50 -07:00
Dianne Hackborn
c30d92e224 Shut. Up.
Change-Id: Id047ab2308903a527bebf80bdacdb01ec51de051
2013-09-20 18:19:00 -07:00
Svetoslav
939d95924a am b39ce63d: Merge "Offer to enable a print service after it is installed." into klp-dev
* commit 'b39ce63d2807c9d5c68d3be052dee7e9da7ec3be':
  Offer to enable a print service after it is installed.
2013-09-20 18:18:36 -07:00
Svetoslav
b39ce63d28 Merge "Offer to enable a print service after it is installed." into klp-dev 2013-09-21 01:15:47 +00:00
Svetoslav
d8f391b4e0 Offer to enable a print service after it is installed.
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.

bug:10447510

Change-Id: Iea56c0825f0bf38328ad94912f0ea5576e9339b3
2013-09-20 17:40:25 -07:00
destradaa
fb339b8a0f am 93d3bdb6: am 47d620ac: Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev
* commit '93d3bdb61a7c868d41a259b56af0914d2f6b2303':
  Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer
2013-09-20 16:26:33 -07:00
destradaa
93d3bdb61a am 47d620ac: Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev
* commit '47d620ac282870f1f7142bd86ab32d14ad9ee91f':
  Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer
2013-09-20 16:23:58 -07:00
destradaa
47d620ac28 Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev 2013-09-20 23:18:15 +00:00
Jeff Sharkey
f439bcd953 am 578f67c2: am dfed2448: Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev
* commit '578f67c25c6bb160cf30bf39b7e41bc039000a5c':
  Delegate mkdirs() to vold when lacking perms.
2013-09-20 16:05:16 -07:00
Jeff Sharkey
578f67c25c am dfed2448: Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev
* commit 'dfed244876d6c0ddd8d8bd2b8f3b970cd0a1ab95':
  Delegate mkdirs() to vold when lacking perms.
2013-09-20 16:01:28 -07:00
Jeff Sharkey
dfed244876 Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev 2013-09-20 22:56:07 +00:00
Robert Greenwalt
13820af302 Fix BatchScan request coalesing
bug:10407896
Change-Id: Ic22c7d8b2a80d490d208570782a12e42d4690f5c
2013-09-20 15:30:17 -07:00
destradaa
7f02eb2c84 Ensure access to the map of geofence callbacks is synchronized in all cases
Fix Java reference leak in the JNI layer

Bug: 10624887
Change-Id: I656973653d82c73a7ba2b51f22989ffed144c5df
2013-09-20 15:19:00 -07:00
Craig Mautner
7538f8ba02 am 83103184: am 04476691: Merge "Remove over-aggressive stack movement." into klp-dev
* commit '83103184be048580673c8e2c3358f6bdd4cfd205':
  Remove over-aggressive stack movement.
2013-09-20 14:34:49 -07:00
Jeff Sharkey
2d8b4e8013 Delegate mkdirs() to vold when lacking perms.
Apps without sdcard_r or sdcard_rw are still able to write to
their package-specific directory, but someone needs to first make
that directory on their behalf.  This change will delegate the
mkdirs() call through to vold when an app fails to create directly.

MountService validates that the path belongs to the calling user, and
that it's actually on external storage, before passing to vold.

Update Environment to make app-vs-vold paths clearer.

Bug: 10577808
Change-Id: I43b4a77fd6d2b9af2a0d899790da8d9d89386776
2013-09-20 14:34:02 -07:00
Craig Mautner
83103184be am 04476691: Merge "Remove over-aggressive stack movement." into klp-dev
* commit '04476691424811f5029194410519f49f913b672d':
  Remove over-aggressive stack movement.
2013-09-20 14:31:25 -07:00
Craig Mautner
0447669142 Merge "Remove over-aggressive stack movement." into klp-dev 2013-09-20 21:28:14 +00:00
Craig Mautner
8916aadd1e Remove over-aggressive stack movement.
Moving a task to the bottom was also moving its stack to the back.
Since chrome always finishes by calling moveTaskToBack this put
the home stack in front of the application stack and would cause
bizarre window layering effects.

Definitely fixes 10764463.
Maybe fixes 10678010.

Change-Id: Ic202ae4fad44b36a8444255764d2135fccd4743d
2013-09-20 13:42:49 -07:00
Nick Kralevich
69527ad1de am ac219aa5: am 662b3bbe: am effefbc4: Merge "Proper security labeling of multi-user data directories."
* commit 'ac219aa5a3249fb0797a8bca474794b7a81b5ce0':
  Proper security labeling of multi-user data directories.
2013-09-20 12:56:40 -07:00
Nick Kralevich
ac219aa5a3 am 662b3bbe: am effefbc4: Merge "Proper security labeling of multi-user data directories."
* commit '662b3bbe08c03de77c0676b4fdc1587723863f1b':
  Proper security labeling of multi-user data directories.
2013-09-20 12:51:47 -07:00
Nick Kralevich
662b3bbe08 am effefbc4: Merge "Proper security labeling of multi-user data directories."
* commit 'effefbc48f41fa484910e66c78a79a34817c345b':
  Proper security labeling of multi-user data directories.
2013-09-20 12:38:52 -07:00
Matthew Williams
ed37b93af8 fix deadlock caused by clearAllBackoffs in SSE
ordering of locks in SyncStorageEngine#clearAllBackoffs()
introduced deadlocks.
Bug: 10751759
Bug: 10680330
Change-Id: Ief118830b6b249de0e7618b6186b4181b4f12f82
2013-09-20 18:24:30 +00:00
Robert Greenwalt
692af53a20 am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev
* commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a':
  Cleanup the shutdown of BatchedScans.
2013-09-20 11:22:35 -07:00
Christopher Tate
cc5db25485 am 2e6eef65: am 3301f76b: Merge "Don\'t back up apps in the \'stopped\' state" into klp-dev
* commit '2e6eef655f079536251ff030d38fb6480dd97a18':
  Don't back up apps in the 'stopped' state
2013-09-20 11:21:18 -07:00
Craig Mautner
d052ee34a5 am f15024c8: am 12946530: Merge "Only show launcher for the bottom activity in a task" into klp-dev
* commit 'f15024c8c8b3d21919347070909049c61c14ae06':
  Only show launcher for the bottom activity in a task
2013-09-20 11:21:00 -07:00
Ed Heyl
083ebcf49a am 3ece8270: am 812c4d73: Merge "fix typo" into klp-dev
* commit '3ece8270173df27518c16a5904ae5fe3c6b51913':
  fix typo
2013-09-20 11:20:33 -07:00
Amith Yamasani
fa80ffa4fd am 638918a2: am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev
* commit '638918a2681cff345b9e3bd5ff7b170a874125dc':
  Fix a regression in pausing activity immediately on sleep
2013-09-20 11:20:03 -07:00