Jeff Brown
046cff13fc
Merge "Fix CTS test failures." into jb-mr1-dev
2012-10-01 17:41:53 -07:00
Jeff Brown
9ba8d78186
Fix CTS test failures.
...
Bug: 7001730
Change-Id: I5649b601c310458de5d64b549a407e251d745b7c
2012-10-01 17:34:07 -07:00
Craig Mautner
80944c5c92
am 397c8629: am b97d8764: Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev
...
* commit '397c862913c2c50e54d18dee7766b0ac93971ae3':
Switch from uevent model to /dev/input/event.
2012-10-01 16:43:27 -07:00
Craig Mautner
397c862913
am b97d8764: Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev
...
* commit 'b97d8764a0aa600d7bcc6242e7173453c87ee658':
Switch from uevent model to /dev/input/event.
2012-10-01 16:40:24 -07:00
Craig Mautner
b97d8764a0
Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev
2012-10-01 16:38:46 -07:00
Dianne Hackborn
cc5a055613
Fix issue #7226101 : Secure image capture takes 5 seconds to start
...
Mostly (turned off) debug output. Main fix is to resume the next
activity if we are pausing while sleeping and the top activity is
not the now pausing activity. Also helped things by fixing a problem
where removing a task would leave around dead destroy timeout
messages.
Change-Id: I9d550c216b4d7e2afe3d93553bb680cec41e2ed1
2012-10-01 16:32:39 -07:00
Jeff Brown
9c1a6f402b
am 0fa30848: am 410bc60a: Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev
...
* commit '0fa30848638df704ce40e163652635fbfde5843c':
Enable hardware acceleration for pointer location overlay.
Disable use of twilight mode for auto-brightness.
Use new API to override user activity timeout from keyguard.
2012-10-01 15:27:27 -07:00
Jeff Brown
0fa3084863
am 410bc60a: Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev
...
* commit '410bc60a77ee3ba6e596e84d44ec23f3325ae310':
Enable hardware acceleration for pointer location overlay.
Disable use of twilight mode for auto-brightness.
Use new API to override user activity timeout from keyguard.
2012-10-01 15:25:35 -07:00
Jeff Brown
13176e639c
am cd781ce2: am cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-dev
...
* commit 'cd781ce2ebc104cf83d630889ae330a980635c9e':
New internal API to eliminate poke locks.
2012-10-01 15:25:30 -07:00
Jeff Brown
cd781ce2eb
am cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-dev
...
* commit 'cb6f950f15919794d26a55c20090fe5dacd11e4a':
New internal API to eliminate poke locks.
2012-10-01 15:22:45 -07:00
Jeff Brown
410bc60a77
Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev
...
* changes:
Enable hardware acceleration for pointer location overlay.
Disable use of twilight mode for auto-brightness.
Use new API to override user activity timeout from keyguard.
2012-10-01 15:22:43 -07:00
Jeff Brown
cb6f950f15
Merge "New internal API to eliminate poke locks." into jb-mr1-dev
2012-10-01 15:20:23 -07:00
Victoria Lease
b57852ab87
am 80faaa35: am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev
...
* commit '80faaa3558a6d21990ae6bcf24eb7f8015db710f':
Avoid NPE in GpsLocationProvider
2012-10-01 15:06:57 -07:00
Victoria Lease
80faaa3558
am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev
...
* commit '2961d111570d310b3ba504784e7cff651bc93207':
Avoid NPE in GpsLocationProvider
2012-10-01 15:02:34 -07:00
Victoria Lease
2961d11157
Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev
2012-10-01 14:59:57 -07:00
Jeff Brown
db21284a7f
Disable use of twilight mode for auto-brightness.
...
This adjustment is still experimental.
Bug: 7165399
Change-Id: I3fcf361933995d02a5329eeaec80155b39371ba3
2012-10-01 14:33:42 -07:00
Craig Mautner
3840b27b5e
am 190ca7dd: am 1f7a09b5: Merge "Only inform DisplayManager of visible content." into jb-mr1-dev
...
* commit '190ca7ddad52ad78a0f313313ab744ed4c7848c8':
Only inform DisplayManager of visible content.
2012-10-01 14:27:53 -07:00
Jeff Brown
1e3b98d47d
New internal API to eliminate poke locks.
...
Added a new WindowManager.LayoutParams inputFeatures flag
to disable automatic user activity behavior when an input
event is sent to a window.
Added a new WindowManager.LayoutParams field userActivityTimeout.
Bug: 7165399
Change-Id: I204eafa37ef26aacc2c52a1ba1ecce1eebb0e0d9
2012-10-01 14:27:34 -07:00
Craig Mautner
190ca7ddad
am 1f7a09b5: Merge "Only inform DisplayManager of visible content." into jb-mr1-dev
...
* commit '1f7a09b5df9f859781d9cfa0053fad44c72c2168':
Only inform DisplayManager of visible content.
2012-10-01 14:26:06 -07:00
Craig Mautner
1f7a09b5df
Merge "Only inform DisplayManager of visible content." into jb-mr1-dev
2012-10-01 14:23:39 -07:00
Craig Mautner
65d11b3eef
Only inform DisplayManager of visible content.
...
WindowManager was notifying DisplayManager of content if any window
existed on a display. Now the window must be visible and we must not
be showing a Dream or the Keyguard.
Bug: 7214060.
Change-Id: I9ce4a49aabfbac22ff1e39a837199ce35b9f7503
2012-10-01 13:59:52 -07:00
Amith Yamasani
b45ab722b7
am 30655e03: am b525c3cf: Merge "Fix broadcast to a specific user" into jb-mr1-dev
...
* commit '30655e0339748cb670eb2fef0dc51dc3c83eee24':
Fix broadcast to a specific user
2012-10-01 13:10:07 -07:00
Amith Yamasani
6021eacb3d
am ce3db01c: am 2036a94a: Merge "Fix cache deletion for secondary users" into jb-mr1-dev
...
* commit 'ce3db01cc8a27e6ee642e9e2c4548b5a03dfde2a':
Fix cache deletion for secondary users
2012-10-01 13:10:04 -07:00
Amith Yamasani
30655e0339
am b525c3cf: Merge "Fix broadcast to a specific user" into jb-mr1-dev
...
* commit 'b525c3cfc7484c87fcf96b48447b2a220b25f519':
Fix broadcast to a specific user
2012-10-01 13:08:10 -07:00
Amith Yamasani
ce3db01cc8
am 2036a94a: Merge "Fix cache deletion for secondary users" into jb-mr1-dev
...
* commit '2036a94a9004613644bdbdab1b10e476be3f0213':
Fix cache deletion for secondary users
2012-10-01 13:08:06 -07:00
Amith Yamasani
b525c3cfc7
Merge "Fix broadcast to a specific user" into jb-mr1-dev
2012-10-01 13:05:28 -07:00
Amith Yamasani
2036a94a90
Merge "Fix cache deletion for secondary users" into jb-mr1-dev
2012-10-01 13:05:28 -07:00
Victoria Lease
5c24fd0342
Avoid NPE in GpsLocationProvider
...
Oops, looks like we were spinning up a secondary thread to run some
tasks that will just happen on the main thread regardless. Removed
the secondary thread and fixed up initialisation order regarding
mHandler and things that post to it. Also reordered GPS and
PASSIVE provider initialisation order since GPS depends on PASSIVE.
This should be both safer and easier to read.
Bug: 7248029
Change-Id: I8630caf0a7bd1b2c401603075676f13dda5be4fa
2012-10-01 12:04:37 -07:00
Jeff Brown
9370592e23
am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
...
* commit '5d359a92658d01b0220f77eb294d6124848739bc':
Remove clearUserActivityTimeout().
2012-10-01 11:41:11 -07:00
Jeff Brown
5d359a9265
am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
...
* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
Remove clearUserActivityTimeout().
2012-10-01 11:39:30 -07:00
Jeff Brown
5e3dcf7210
Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev
2012-10-01 11:35:55 -07:00
Amith Yamasani
e98bde011c
Fix broadcast to a specific user
...
Bug: 7255777
Bug: 7263657
When userId is neither CURRENT nor ALL, the correct list of receivers
was not being built, due to a typo in ActivityManagerService;
Change-Id: Ib1dc627f0dbd1c91d02c718d2e4d2384ad687d1f
2012-10-01 11:30:47 -07:00
Amith Yamasani
54289b8b4a
Fix cache deletion for secondary users
...
Bug: 7249419
Change-Id: Idbc0f9994508059ebf5055aea961b87e08b3673a
2012-10-01 11:19:55 -07:00
Adam Powell
586439676f
am 21a80ff4: am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
...
* commit '21a80ff4d1a557d8e33f86a218d204c0093fefc7':
Construct a task stack for picking a wifi network from notification
2012-10-01 10:36:48 -07:00
Adam Powell
21a80ff4d1
am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
...
* commit 'c56e5600501a5c376dc13e6a99fcec7782fc8718':
Construct a task stack for picking a wifi network from notification
2012-10-01 10:34:59 -07:00
Adam Powell
c56e560050
Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev
2012-10-01 10:32:35 -07:00
John Spurlock
e58fc04f7c
am db3b01a5: am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
...
* commit 'db3b01a5bfbf5e190bf6116b71e27971c3b5816b':
Status bar: Keep disabled state per user.
2012-10-01 10:24:05 -07:00
Satoshi Kataoka
6ce84e681e
am c97fa8f8: am 135e5fb7: Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
* commit 'c97fa8f8a02f1850779cc1e6ff6b67bcdbeecb1b':
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
2012-10-01 10:17:05 -07:00
Jeff Sharkey
1586c228f7
am f138e3ce: am 71520a68: Merge "Handle ISE when physical volume isn\'t mounted." into jb-mr1-dev
...
* commit 'f138e3cec9aa6b86a0e614a39ed29f0709ebfabd':
Handle ISE when physical volume isn't mounted.
2012-10-01 10:16:35 -07:00
Dianne Hackborn
3645f2ccde
am 55241249: am 2a30547a: Merge "Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
...
* commit '552412496c00c04c9af353785936a89743677d49':
Work on issue #6949468 : android.dpi.cts.ConfigurationScreenLayoutTest...
2012-10-01 10:16:22 -07:00
rich cannings
fdd8a81015
am 60000916: am 2b58c1b5: Merge "Disable package verification in test harness" into jb-mr1-dev
...
* commit '6000091663200e8846f418db99f2b4618cc6a294':
Disable package verification in test harness
2012-10-01 10:16:14 -07:00
Craig Mautner
7b9a263b50
am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev
...
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
Changing debug for b/7094175.
2012-10-01 10:15:05 -07:00
Svetoslav Ganov
798af86dcc
am 82e21b33: am 9ea8f390: Explore by touch enabled when screen magnification is on.
...
* commit '82e21b33bde057ba21dde9ee2023d785b4b5a757':
Explore by touch enabled when screen magnification is on.
2012-10-01 10:14:19 -07:00
Jeff Brown
843b014aca
am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev
...
* commit '489c1e9f82250770004ec9080778546b040f6146':
Get rid of preventScreenOn().
2012-10-01 10:13:52 -07:00
Dianne Hackborn
d698542867
am 66e92752: am 84215565: Merge "Fix issue #7255954 : API Review: rename Dream to DreamService" into jb-mr1-dev
...
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
Fix issue #7255954 : API Review: rename Dream to DreamService
2012-10-01 10:13:25 -07:00
John Spurlock
db3b01a5bf
am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev
...
* commit 'ff70848eb2a6b916ad2ad2ceec0c59bcb41373a2':
Status bar: Keep disabled state per user.
2012-10-01 10:13:14 -07:00
Svetoslav Ganov
8173646ea4
am 45cde607: am c5211780: Merge "Sending interaction end event at the end of a drag." into jb-mr1-dev
...
* commit '45cde607d5c6dfe39675a12d3bc47a0bc74565a2':
Sending interaction end event at the end of a drag.
2012-10-01 10:13:12 -07:00
Victoria Lease
38389b6cf7
Route GPS notifications to all users.
...
This takes the easy way around notifying the correct users
about GPS state transitions by notifying ALL the users(!).
I've also laid groundwork for proper multiuser support in
LocationManager and did a tiny bit of cleanup in
GpsNetInitiatedHandler while I was looking at notifications.
Bug: 7213552
Change-Id: I2d6dc65c459e55d110ac0f5f79ae7a87ad638ede
2012-10-01 09:09:25 -07:00
John Spurlock
13451a25ff
Status bar: Keep disabled state per user.
...
Bug:7165607
Change-Id: If6f7a41c2516996612aef5e013dd0d2bd23f9084
2012-10-01 11:44:37 -04:00
Satoshi Kataoka
c97fa8f8a0
am 135e5fb7: Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
...
* commit '135e5fb71242b1151929e2ea7bf221ff421e6ad2':
Always accept API calls from processes which have INTERACT_ACROSS_USERS_FULL in InputMethodManagerService
2012-10-01 00:29:44 -07:00