16108 Commits

Author SHA1 Message Date
Justin Koh
92ffd6b5fe am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
* commit '28d01e677c05edaa45456a26dff22d1b0fc28164':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
2014-09-30 00:39:16 +00:00
Justin Koh
267874622e DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
This is a hack for this version: in a future framework version, there is an API
to do this.

Bug: 17646502
Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c
2014-09-26 22:23:33 +00:00
Kevin Ma
938ff081a6 am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
* commit '18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
2014-09-26 19:43:39 +00:00
Kevin Ma
8174879e09 Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
This reverts commit 04c6d73fd0e4472505275688ef8497bc6697647c.

Bug: 17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
2014-09-26 18:51:16 +00:00
Justin Koh
1c487938c4 am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
* commit '04c6d73fd0e4472505275688ef8497bc6697647c':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
2014-09-26 01:41:55 +00:00
Justin Koh
04c6d73fd0 Revert "DO NOT MERGE Fix race condition between binder deaths"
This reverts commit 8828d86e79424fc1c7b7d1f908e3450879d5cea0.

Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
2014-09-26 01:29:17 +00:00
Craig Mautner
6ae7ea942f am 8828d86e: DO NOT MERGE Fix race condition between binder deaths
* commit '8828d86e79424fc1c7b7d1f908e3450879d5cea0':
  DO NOT MERGE Fix race condition between binder deaths
2014-09-26 01:20:54 +00:00
Craig Mautner
8828d86e79 DO NOT MERGE Fix race condition between binder deaths
If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
(cherry picked from commit 5acd163b828d5b26408eb3a7904d750a1570239e)
2014-09-26 01:01:42 +00:00
Jeff Vander Stoep
bca67fd7d0 am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '9aaf54eeb6c1dd83090235a8df5476b2f2f6473e':
  Sanity-check paths of files to be restored
2014-09-23 17:26:47 +00:00
Jeff Vander Stoep
bbf7e4af97 am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '1cf337a222bbb0e26445e7904ece687af93aac48':
  Change permission guard on bindBackupAgent()
2014-09-23 17:26:42 +00:00
Jeff Vander Stoep
9aaf54eeb6 am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '71b19fc301ff08bd13d394dfa9ef6a3f535b149e':
  Sanity-check paths of files to be restored
2014-09-23 17:12:38 +00:00
Jeff Vander Stoep
1cf337a222 am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '52824dab7ba48713411ff3a26580b29aa2088242':
  Change permission guard on bindBackupAgent()
2014-09-23 17:11:58 +00:00
Jeff Vander Stoep
5ba31e6e9a am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit 'bba797957a83b0ee8869cfa8a9427f6506f74fa4':
  Sanity-check paths of files to be restored
2014-09-23 16:50:29 +00:00
Jeff Vander Stoep
1b4f1a794d am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '1c2eaa784b2376b674cf438f42342271c8aa79a8':
  Change permission guard on bindBackupAgent()
2014-09-23 16:50:16 +00:00
Jeff Vander Stoep
bba797957a am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '25c866a8efa148886280b34c0413a1c2c20c247f':
  Sanity-check paths of files to be restored
2014-09-23 16:34:53 +00:00
Jeff Vander Stoep
e2adb1ff4a Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 2014-09-23 16:13:42 +00:00
Jeff Vander Stoep
7bc601d5d7 Sanity-check paths of files to be restored
(cherry picked from commit 7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug: 16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
2014-09-22 23:21:20 +00:00
Jeff Vander Stoep
1c2eaa784b am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '660af7eb1a55e2df7da45aa63ca227141ef86b34':
  Change permission guard on bindBackupAgent()
2014-09-11 18:58:49 +00:00
Jeff Vander Stoep
a8f6d1bffc Change permission guard on bindBackupAgent()
Bug: 15829193
Change-Id: I6c1c39923b7b1a9f528f97da10913cb7f2d7e8f9
2014-09-10 14:20:14 -07:00
Michael Wright
144c21c2a0 am da3b4363: DO NOT MERGE: Use a linear spline if there\'s a non-monotonic brightness curve
* commit 'da3b43633fe86d69aab5cab52826e76e01f18d63':
  DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
2014-09-02 22:02:23 +00:00
Michael Wright
da3b43633f DO NOT MERGE: Use a linear spline if there's a non-monotonic brightness curve
Some devices may contain things like transflective displays where
they actually want the backlight brightness to decrease in the face
of high ambient light scenarios. In the interest of time, just use a
linear interpolation based on the brightness control points for these
cases but in the future we should consider adding a non-monotonic
cubic spline.

Bug: 15611140
Change-Id: I308ad00943d916866ee8d2507a41b7032e6b524e
2014-09-02 14:47:37 -07:00
Jesse Hall
87978406b4 am df7af46a: VirtualDisplayAdapter: Set the transaction surface even if NULL
* commit 'df7af46a4c034410dd1544415c3dcf19edef82e3':
  VirtualDisplayAdapter: Set the transaction surface even if NULL
2014-08-19 16:31:17 +00:00
Jesse Hall
df7af46a4c VirtualDisplayAdapter: Set the transaction surface even if NULL
Bug: 17116728
Change-Id: I55e4a2e575cfd3788fbdb90b050dac486976c1b6
2014-08-19 09:18:40 -07:00
Prashant Malani
639421cbd9 am fed4a556: Merge "Move wakelock release to handleMessage" into klp-modular-dev
* commit 'fed4a5565b9318fa1132003ad3599fa42bbefdf0':
  Move wakelock release to handleMessage
2014-08-07 22:10:25 +00:00
Prashant Malani
7450614a49 Move wakelock release to handleMessage
There were certain code paths in handleDockStateChange() that were
exiting without releasing the wakelock. So we move the release to the
calling function to prevent stray held wakelocks.

Bug: 16841895

Change-Id: I8ae4d2ab8f775c42a893d3bcdef34321c5f631a6
Signed-off-by: Prashant Malani <pmalani@google.com>
2014-08-06 22:22:18 -07:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
2014-07-28 23:28:59 +00:00
Craig Mautner
0fa45d93f7 Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 2014-07-28 22:45:16 +00:00
Craig Mautner
7f13ed37fd Remove PendingActivityLaunches based on stack.
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
2014-07-28 14:00:35 -07:00
Craig Mautner
a9c5257a15 am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately
2014-07-25 02:19:53 +00:00
Craig Mautner
a0bb44efe9 Merge "Finish crashed activities immediately" into klp-modular-dev 2014-07-24 20:48:02 +00:00
Craig Mautner
8e5b133bf6 Finish crashed activities immediately
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.

Fixes bug 15092354.

Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
2014-07-24 13:32:37 -07:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
2014-07-24 18:06:03 +00:00
Prashant Malani
a04ea61db5 Revert "Remove circular mask"
This reverts commit 2e8b27e898af3af1165a79e7c5f8b59f63f20a2f.

It also makes the circularMask option configurable via overlay.
It is set to false by default.

An offset dimension entry is also provided, for displays which have
a "chin". This is set to 0 by default.

Bug: 16380982
Change-Id: I16ec3e8d8882a6683c9155055944e5c2f5cd781e
2014-07-23 17:26:08 -07:00
Justin Koh
e959e4a017 am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev
* commit 'a63272b4b5eff16f4d6fae4730b8a7087563181c':
  Revert "Wait for all windows to draw before turning screen on"
2014-07-22 16:31:06 +00:00
Justin Koh
a63272b4b5 Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev 2014-07-17 21:09:48 +00:00
Justin Koh
528b4b7572 Revert "Wait for all windows to draw before turning screen on"
This reverts commit 0a589b929e18d05d1345d97283c3025058ddca18.

Change-Id: Ia73555cd7797b5d172f33db9f46ebc211af6fc1e
2014-07-22 00:26:23 +00:00
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
2014-07-17 19:55:32 +00:00
Prashant Malani
9353e1a2b2 Merge "Make the booting flag update unconditional" into klp-modular-dev 2014-07-17 18:11:21 +00:00
Justin Koh
0a93106964 am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.
2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on
2014-07-17 10:55:56 +00:00
Craig Mautner
0a589b929e Wait for all windows to draw before turning screen on
Was previously only waiting for windows on the primary display to
draw which meant that windows on ActivityViews had not yet drawn.
This fix checks redraws all outstanding Surfaces before unblanking
the screen.

Fixes bug 15092354.

Change-Id: Id550db003a5f56931eb68464085596e47d25481d
2014-07-16 17:03:36 -07:00
Justin Koh
65d7c332d7 Merge "Additional cleanup after stack deletion." into klp-modular-dev 2014-07-16 22:30:55 +00:00
Craig Mautner
ee36c77acd Additional cleanup after stack deletion.
- Remove activity from PendingActivityLaunch list when it is removed
from stack. This prevents the delayed launch causing
IllegalArgumentException in b/16045752.
- Move PendingActivityLaunch from ActivityManagerService to
ActivityStackSupervisor.
- Immediately call onTaskListEmptyLocked() in cases where no
activities are found in stack.

Fixes bug 16045752.

Change-Id: Ia69a449e7f5e08ab6e36157d0fd793c4d2fdaca4
2014-07-16 15:03:11 -07:00
Prashant Malani
14bff9f55e Make the booting flag update unconditional
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560
2014-07-16 00:00:41 +00:00
Michael Kolb
dca272b8c2 am 0cb38d2e: Merge "Add configuration for activity thumbnails" into klp-modular-dev
* commit '0cb38d2e5ab32fd34c8129f3c2d1c158bad9abc3':
  Add configuration for activity thumbnails
2014-07-11 01:46:12 +00:00
Aaron Whyte
d2b5f7da35 am f5e67474: Allow overlays to configure ConnectivityService\'s network sampling to not wake the device. This can increase clockwork device battery life. Bug:15455204
* commit 'f5e6747440cc0d29c663a792e32d9618f842ecf2':
  Allow overlays to configure ConnectivityService's network sampling to not wake the device. This can increase clockwork device battery life. Bug:15455204
2014-07-11 01:46:08 +00:00
Aaron Whyte
f5e6747440 Allow overlays to configure ConnectivityService's network sampling to not wake the device.
This can increase clockwork device battery life.
Bug:15455204

Change-Id: Ifc551e6a522627dc8e5cfdfb8f56d4e3cbeea936
2014-07-10 14:05:35 -07:00
Michael Kolb
0cb38d2e5a Merge "Add configuration for activity thumbnails" into klp-modular-dev 2014-07-10 20:49:26 +00:00
Michael Kolb
5f6238e4a7 Add configuration for activity thumbnails
Bug: 15750584

Change-Id: I0b2bfb46022b46d7649f6d9ba9ba74cdfc70a6ea
2014-07-10 14:43:51 -07:00
Robin Lee
06505d234d am 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"
* commit '1f0180bfa877373b239a5675f715288db829fa75':
  Make misc config directory during user creation
2014-07-09 17:43:56 +00:00