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

4396 Commits

Author SHA1 Message Date
Sreeram Ramachandran
44774ad079 am 9e987f1d: am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '9e987f1d76e18bca72583ab5f4ff65ae4e8c381e':
  Send app permissions to netd.
 2014-10-02 13:39:05 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00:00
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
 2014-10-02 13:38:16 +00:00
Dianne Hackborn
0c709a0c0c am f96d125c: am 84402777: am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev 
* commit 'f96d125c569e181cb22583f295146250d58ec196':
  Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
 2014-10-02 13:37:51 +00:00
Dianne Hackborn
ef2bc5ccd4 am def99c9d: am 51bd2041: am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit 'def99c9da6c47628ebe2b731387d98a79e63acdf':
  Revert white space changes.
 2014-10-02 13:37:33 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Winson Chung
594d2a5690 am 7f54b3a9: am 6b59887e: am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '7f54b3a91430a73241b9ba34bfadf74997c495db':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-02 12:41:53 +00:00
Sreeram Ramachandran
4f4b81bd3d am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit 'c04e922f67cacfc428d09fd266f7c9b36a6fb472':
  Send app permissions to netd.
 2014-10-02 06:34:16 +00:00
Sreeram Ramachandran
c04e922f67 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
 2014-10-02 06:29:37 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd. 
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
 2014-10-01 20:22:34 -07:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
John Spurlock
b3a90ee245 am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit '7e67011f15dd3c7df3200358d950cf4e4429db2c':
  Zen: Fix new event category check.
 2014-10-02 00:58:36 +00:00
Dianne Hackborn
ded96310cf am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '796d6eced1e23217914e639da45d9371baf8a5b0':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:32:02 +00:00
Dianne Hackborn
796d6eced1 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:27:48 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
c6646b0cb4 am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '739bf81dd130957c9bc09abc4e25732af2d675c0':
  Implement auto-sleep functionality.
 2014-10-02 00:09:47 +00:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:01 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07:00
Dianne Hackborn
8440277784 am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev 
* commit '9a4afb3f5172cdd68e14fb0e48f48d619420cd89':
  Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
 2014-10-01 23:41:07 +00:00
Dianne Hackborn
9a4afb3f51 am c3e7f87b: Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev 
* commit 'c3e7f87bf9930a20c37609f567f5d88305fb1ddd':
  Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
 2014-10-01 23:35:49 +00:00
Dianne Hackborn
51bd204112 am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit 'bfa6190fcc5ac607bf7045963d57b06cc2b16207':
  Revert white space changes.
 2014-10-01 23:31:49 +00:00
Dianne Hackborn
c3e7f87bf9 Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev 2014-10-01 23:29:49 +00:00
Dianne Hackborn
bfa6190fcc am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit '144508d5da4dec37183617ec259ab83d2db4f012':
  Revert white space changes.
 2014-10-01 23:25:43 +00:00
Dianne Hackborn
144508d5da Merge "Revert white space changes." into lmp-dev 2014-10-01 23:21:11 +00:00
Winson Chung
6b59887e57 am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit 'f7d4eb52aef5670270d5ba727431d0b2411cbc58':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-01 23:05:36 +00:00
Winson Chung
f7d4eb52ae am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '7f76e505624fddbc4ba3350f3e381ccd275a5a75':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-01 22:59:26 +00:00
Winson Chung
7f76e50562 Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 2014-10-01 22:53:29 +00:00
Dianne Hackborn
9449a6162e Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build. 
There was a path through idle where we could clear mBooting but not set
mBooted, so we would no longer start activities.  This is probably happening
because if you start a user or userdebug build with the device plugged in
to adb, the system early on starts the USB security dialog, before home is
started.  If that goes idle first, we will end up in the case where we
clear booting (because something went idle) but not set booted (because it
was not home that went idle).

Change this so that we always set booted when clearing booting.

Change-Id: I40053710eefa939315aeb9475ecdd2e8a87351ff
 2014-10-01 15:53:28 -07:00
Dianne Hackborn
01945f240a Revert white space changes. 
Change-Id: I3bc9995adf5cefd91f5a9fd4d2a701056dba3ca9
 2014-10-01 15:14:28 -07:00
Winson Chung
dcf21d1545 Fixing invalid check to get component enabled state. (Bug 17679693) 
Change-Id: I225d59bf766122d667d990d7e5b1971c6e8af2aa
 2014-10-01 15:04:16 -07:00
Brian Carlstrom
37fdb6e981 am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'b3ab7b95a687e4de13d06822fb295ee726b4b42f':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:02:36 +00:00
Jeff Brown
7ee1f53d3d am 5a3f98aa: am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '5a3f98aa8aafc16f6a8c3a4e5a813f7459a7cd92':
  Reduce latency from doze to screen on.
 2014-10-01 22:02:24 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality. 
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
 2014-10-01 15:01:10 -07:00
Wink Saville
ed49288a00 Merge commit '62321ab1' into fix-merge-conflict 
* commit '62321ab1':
  Maybe fix issue #17700474: manta: high occurrence of device booted...

Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: Ica4d544d11c1f81be793bdb4dea610396b32e946
 2014-10-01 14:14:10 -07:00
Craig Mautner
3867e4d0c0 am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '9ab8fbbc60588b204d362bdab45d892e8274382b':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:58:34 +00:00
Craig Mautner
9ab8fbbc60 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:52:57 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
John Spurlock
394f29e761 am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit 'cd98a55956a251aad1cafb8c55d2e683037b8b97':
  Zen: Fix new event category check.
 2014-10-01 17:20:30 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top 
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
 2014-10-01 10:14:53 -07:00
Winson Chung
bb6a08cfdb am a173d9c8: am 57583c33: am d164460e: am 86ef70eb: Fixing build (Bug 17381033) 
* commit 'a173d9c83f411c74c2dfe8214a0f32cf6b66b7e7':
  Fixing build (Bug 17381033)
 2014-10-01 17:10:40 +00:00
Winson Chung
2a988941fc am cbb42d06: am 806a25a5: am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev 
* commit 'cbb42d06c21a4875bfb5d0c5ff73ceae062356d0':
  Fixing an issue with leaking starting windows. (Bug 17657878)
 2014-10-01 17:10:34 +00:00
Craig Mautner
f82897a21c am d2e3bfce: am c139a41c: am d6770a0c: am 4fb4163f: Merge "Call Surface.release() for starting windows" into lmp-dev 
* commit 'd2e3bfcefddeef45b3bda04fd0e9ea00f62ab689':
  Call Surface.release() for starting windows
 2014-10-01 17:10:29 +00:00
Jeff Sharkey
ae66513bb0 am 029a4b98: am 3de5ed51: am 7bd4aba1: am b27d43a8: Merge "Clear ident when obtaining provider across users." into lmp-dev 
* commit '029a4b98cc09a516f1ae37f580cb68047d01f2a2':
  Clear ident when obtaining provider across users.
 2014-10-01 17:10:08 +00:00
Svetoslav
047ab3b2e5 am cf0a3373: am 344ffbc6: am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit 'cf0a337352a228302d44f9582673c7acdba329ca':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 17:10:00 +00:00
John Spurlock
cd98a55956 am c909e1b2: Zen: Fix new event category check. 
* commit 'c909e1b2dfa2e47b786d96818f70f6308c5a78be':
  Zen: Fix new event category check.
 2014-10-01 16:56:02 +00:00
John Spurlock
c909e1b2df Zen: Fix new event category check. 
Allow events through if configured, and use a switch
for separating mode-specific logic.

Bug:17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
 2014-10-01 11:17:43 -04:00
Brian Carlstrom
c9e46543e7 am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'ae214fac0fa3887c41b1b16a0016a4e6f5b127b1':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 15:16:27 +00:00
Jeff Brown
f0245cb2e3 am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '6907304024f1c31d2d2dcf783588a6dd8865ecd8':
  Reduce latency from doze to screen on.
 2014-10-01 15:16:19 +00:00
Dianne Hackborn
d0ab6d6dbf am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit '88998f79f1344650bc3ebf704600b03bfde2619f':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 15:16:09 +00:00