Commit Graph

6126 Commits

Author SHA1 Message Date
Adam Lesinski
051b810da6 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
am: c708cf6340

* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
  BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd
2016-04-21 00:50:07 +00:00
Adam Lesinski
c708cf6340 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev 2016-04-21 00:39:59 +00:00
Tim Murray
b16a93f955 Merge "Increase the max binder thread pool size for system_server." into nyc-dev
am: 150553756f

* commit '150553756f89a51cc70b24cd9dbab4bdfba0fc59':
  Increase the max binder thread pool size for system_server.

Change-Id: I8312e28eac4b6b00b94af85d0e887448ec849652
2016-04-21 00:39:06 +00:00
Tim Murray
150553756f Merge "Increase the max binder thread pool size for system_server." into nyc-dev 2016-04-21 00:32:47 +00:00
Christopher Tate
9e92c03991 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am: 665189f

* commit '665189f92646d34bf02082120cba3c62aa718770':
  Don't back up wallpapers that we've been told not to

Change-Id: I45d037436e349445f091a7dad5abad4b7421ad8e
2016-04-20 22:13:17 +00:00
Chris Tate
665189f926 Merge "Don't back up wallpapers that we've been told not to" into nyc-dev 2016-04-20 22:10:40 +00:00
Adam Lesinski
76a267bc26 BatteryStatsHelper: Include screen on baseline power draw
Calculate the baseline power usage for the device when it is in suspend and idle.
The device is drawing POWER_CPU_IDLE power at its lowest power state.
The device is drawing POWER_CPU_IDLE + POWER_CPU_AWAKE power when a wakelock is held.
The device is drawing POWER_CPU_IDLE + POWER_CPU_AWAKE + POWER_SCREEN_ON when the screen is on.

Bug:27533512
Change-Id: Idcb587390bc8159fcbd6625cca4cb1aca19976d6
2016-04-20 14:40:38 -07:00
Christopher Tate
d7faf53605 Don't back up wallpapers that we've been told not to
In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value.  Restore still knows about legacy data that gets
delivered via the older key/value mechanism.

This change also has the effect of removing the size limitations
around wallpaper restore acceptance.  Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.

Bug 25453848
Bug 25727875

Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d
2016-04-20 14:34:07 -07:00
Adam Lesinski
50e1291340 Merge "Record in progress count when parceling Timer" into nyc-dev
am: 752434a

* commit '752434a0ff54ac30b7701292b66361e64b2ae5a0':
  Record in progress count when parceling Timer

Change-Id: Icc7e8312df00bd22f0e5433e15fc65d2ad705db4
2016-04-20 01:31:46 +00:00
Adam Lesinski
752434a0ff Merge "Record in progress count when parceling Timer" into nyc-dev 2016-04-20 01:22:37 +00:00
Adam Lesinski
98f0d4692c Record in progress count when parceling Timer
The total time is computed before parceling, but the total count is not.

Bug:27747854
Change-Id: If3afdca9605f74d96a54fb9df17f6df761b99e55
2016-04-19 17:21:40 -07:00
Jorim Jaggi
4ed3f1dd1c Merge "Fixes for resize thread" into nyc-dev
am: 13219992a0

* commit '13219992a0e8b08195ffd596d40d9ceecbf741e0':
  Fixes for resize thread

Change-Id: I2efa14b883a2d9ad31b6e2c4fd72a2b2258adf69
2016-04-20 00:14:31 +00:00
Jorim Jaggi
13219992a0 Merge "Fixes for resize thread" into nyc-dev 2016-04-20 00:07:54 +00:00
Winson
174e1aceb0 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
am: b77d0bcc84

* commit 'b77d0bcc840fbda8372c4042a1f2e83df8e12a83':
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.

Change-Id: I535255c12415caf02e30885fb4efc0efd04cdbc6
2016-04-19 23:09:21 +00:00
Winson Chung
b77d0bcc84 Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
* changes:
  Tweaking accessibility actions for dock divider.
  Ensure that the drag view is not dimmed.
  Disallowing scrim activity from setting TaskDescription.
2016-04-19 23:01:20 +00:00
Adrian Roos
30110b80f7 Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev
am: 3dd5948

* commit '3dd59487cc5f01f38e1e5068ce9257a40473baba':
  Fix unprotected StatusBarManagerService calls

Change-Id: I3afc4a7c1ed8e1f73dcd4c4c0c00a3eb40ac3ce1
2016-04-19 22:17:11 +00:00
Adrian Roos
3dd59487cc Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev 2016-04-19 22:05:44 +00:00
Winson
ce9630da86 Tweaking accessibility actions for dock divider.
- Adding tl_full/70%/50%/30%/rb_full

Bug: 27724715
Change-Id: Ie3125ec81e6463696cf56640c6b86f9cfcbda945
2016-04-19 14:46:24 -07:00
Jorim Jaggi
0d6222d96d Fixes for resize thread
- Make sure to draw navigation bar/status bar background before the
main render node. This is to avoid any flickering when entering
resizing mode, so you rather overdraw than underdraw.
- Draw the first frame from the main thread directly to increase
chance that all drawing commands are processing within a single
frame.

Bug: 27864358
Bug: 28003586
Change-Id: I033f57cdbcb2c16ea93134c041095a415d5c25b4
2016-04-19 14:41:11 -07:00
Tim Murray
eef4a3d53c Increase the max binder thread pool size for system_server.
bug 28201939

Change-Id: Iaade417a26247970b96f0aaacb3844d72de6399c
2016-04-19 14:14:20 -07:00
Joe Onorato
1f3b7e1529 Merge "Add the wall clock time to dumpsys cpuinfo so it\'s easier to correlate with the logs." into nyc-dev
am: 6bf86d5

* commit '6bf86d5e5ca73bceeb4f46771eabdc946ddc56e1':
  Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs.

Change-Id: Ib051ed05ac47a05312e82d9535cc6ac4f39a8058
2016-04-19 21:01:07 +00:00
Joe Onorato
d2bc2ba778 Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs.
Bug: 28113068
Change-Id: Ifa90192b0aa3f57ba6928f38199beb5b56bca7e6
2016-04-19 11:27:11 -07:00
Samuel Tan
17804abf32 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev
am: e749cd3

* commit 'e749cd3b15bb14e6dc4ff2724ec1ed56ba269b4c':
  StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize

Change-Id: I6c1091f9374d759da67a72703e1f688b8cd1f13d
2016-04-19 17:35:10 +00:00
Samuel Tan
e749cd3b15 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev 2016-04-19 17:25:33 +00:00
Jeff Sharkey
4dc65d31a1 Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev
am: 89fa73f

* commit '89fa73fd7abe0f87634d2914163a8fc79ba2f738':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: I0043da18fabef2c5c916a2e5562d9e613c2b057c
2016-04-19 17:16:25 +00:00
Jeff Sharkey
89fa73fd7a Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev 2016-04-19 17:11:20 +00:00
Adam Lesinski
63696c00e2 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
am: 0d47f4b

* commit '0d47f4b6463077074abd6bed489a5f9243615c64':
  BatteryStats: Introduce Async external stats requests

Change-Id: I7319535a0210e38a6bc3731a9f0ec42a4485924f
2016-04-18 23:38:11 +00:00
Adam Lesinski
0d47f4b646 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 2016-04-18 23:27:10 +00:00
Adam Lesinski
06c8841483 Merge "Use Activity resources in DecorContext" into nyc-dev
am: 6cc3199

* commit '6cc31990fc1952b9533cf9b695dd287b87a93e82':
  Use Activity resources in DecorContext

Change-Id: I84b65df4644dc08e252a609a0544138228e9e4c9
2016-04-18 22:35:24 +00:00
Adam Lesinski
6cc31990fc Merge "Use Activity resources in DecorContext" into nyc-dev 2016-04-18 22:23:43 +00:00
Jeff Sharkey
84a4c971c4 Unlock should always wait for pending PRE_BOOT.
While processing an unlock request, we might go async to handle
long-running operations like dispatching PRE_BOOT_COMPLETED.  This
change ensures that all unlock requests for a particular user wait
in line behind any pending async operations.

Without this CL, any subsequent unlock requests would immediately
return successful, even though PRE_BOOT_COMPLETED events were still
being processed.

Bug: 28240584
Change-Id: I307d6aaebfb8f38028f3666a2e19e4399b7cf3a7
2016-04-18 15:38:35 -06:00
Adrian Roos
f2efdd8c7c Fix unprotected StatusBarManagerService calls
Some Binder calls in StatusBarManagerService were
left unprotected. They had no business being binder
calls in the first place, so they got moved to
StatusBarManagerInternal.

Bug: 28222649
Change-Id: Ib26dcca413eb642ba8cd6a4482bf13071f8bd3ab
2016-04-18 13:36:40 -07:00
Chris Craik
2554b09fc9 Merge "Improve multi-window render clipping logic" into nyc-dev
am: c79c324

* commit 'c79c3246c9a3e0d2aa34afd18fddc95a6aff0f30':
  Improve multi-window render clipping logic

Change-Id: I4be0f6cefba71f7928fec559481fe389d9de800b
2016-04-18 19:52:03 +00:00
Chris Craik
c79c3246c9 Merge "Improve multi-window render clipping logic" into nyc-dev 2016-04-18 19:40:50 +00:00
Adam Lesinski
ff22a56ef8 Use Activity resources in DecorContext
We use the application context in DecorContext to avoid holding a reference
to the Activity. However, the resources don't match the Activity's in a multi-window
world, so we use the resources from the Activity, which  get updated as the Activity
goes between multi-window states. This avoids holding a reference to the Activity.

Bug:28096052
Change-Id: I2804f2420afad6dcecc56e5dece008c390540d72
2016-04-18 12:14:12 -07:00
Chris Craik
9cd1bbe5c9 Improve multi-window render clipping logic
Fixes: 28125010

Restructures 'scene defer', to implement window backdrop overdraw
avoidance in new render pipeline, and disable clipping to content draw
bounds.

Also restructures FrameBuilder's constructors, to separate out into
multiple defer methods.

Change-Id: I53facb904c1a4a4acc493d8a489921a79a50494e
2016-04-18 10:39:02 -07:00
Narayan Kamath
3a00b69702 Remove unnecessary allocation+unboxing of objects.
am: a09b4d2

* commit 'a09b4d2a611a7606e8fc8c73a24bd941b6fc173f':
  Remove unnecessary allocation+unboxing of objects.

Change-Id: Idfffa8fad0f6bcffa954752910524bdc879d65b7
2016-04-18 10:31:37 +00:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Adam Lesinski
010bf374d8 BatteryStats: Introduce Async external stats requests
Instead of calling out to external processes with a blocking IPC,
pass along a Binder on which the external process can pass back
the response. The calling process can then wait for the reply with
a timeout.

This eliminates watchdog restarts of the system_server when an external
process like telephony or bluetooth hangs.

Bug:26842468
Change-Id: I1b242e4ed22a63f1a4a0be8c78de8ac4d7bf56c5
2016-04-15 15:27:52 -07:00
Samuel Tan
2326e9b21c StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize
Reset LogRecords.mOldestIndex when we resize LogRecords with
LogRecords.setSize(), so that LogRecords.get() will use the
correct index to fetch log records.

BUG: 28214608
Change-Id: I58d94d9fe61af6a0e9cba224ff98aad36eb3cd1d
2016-04-15 14:17:42 -07:00
Jorim Jaggi
c6eca1da44 Merge "Fix wrong transition when dock minimized and docked app launched" into nyc-dev
am: b3e26a9

* commit 'b3e26a9b414da986963bade0e18a80a20851c74a':
  Fix wrong transition when dock minimized and docked app launched

Change-Id: Ie1982a5e495794e8624c93e970896445579fa98f
2016-04-15 20:54:37 +00:00
Jorim Jaggi
681fc7b267 Fix wrong transition when dock minimized and docked app launched
When having an app docked and then going home, and then launching
the app from the homescreen, we had a wrong transition because
getTopMost task was already set to the launched app, because
getRunningTasks doesn't exclude the docked stack. Instead of adding
flags for getRunningTasks, which sounds risky, we just pass a "force"
value when we launch recents in this state.

Bug: 27154882
Change-Id: Iee4512fed13115dbbe8b74413ff1fa9b87afa0ef
2016-04-15 19:23:05 +00:00
Benjamin Franz
f1320d1d7f Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev
am: 2f4c229

* commit '2f4c2299c7ef4b9d604b9833c790a7afd2ed75af':
  Maybe decrypt user when quiet mode is disabled

Change-Id: I0d84934a978205c283b846b7412446a064aac01c
2016-04-15 14:58:54 +00:00
Benjamin Franz
f02420c5e1 Maybe decrypt user when quiet mode is disabled
When quiet mode is disabled for a user and that user is not currently
decrypted, we show a confirm credentials screen to trigger decryption
of that user. Only if that was successful, do we actually disable quiet
mode.

Bug: 27764124
Change-Id: Ib1f649194d89e225dad62c14f3ddba1fa3d79da2
2016-04-15 14:12:41 +01:00
Andrii Kulian
021af1800c Merge "Remember task which is being locked" into nyc-dev
am: 5981b8c

* commit '5981b8c2e8f6363d1f3bf09e7f1b3b5fb9a3846a':
  Remember task which is being locked

Change-Id: Id672304edaa6a02777e79fe6b4fcdd64e3c5f7e8
2016-04-15 04:37:48 +00:00
Andrii Kulian
5981b8c2e8 Merge "Remember task which is being locked" into nyc-dev 2016-04-15 04:32:57 +00:00
Andrii Kulian
0f051f5abd Remember task which is being locked
We need to remember task which requested to be locked
because we can accidentally lock another task after
user interacts with pinning request dialog.

Bug: 27876860
Change-Id: Ie8e607df4380dd33ea9b3474afc247b02e31de07
2016-04-14 19:26:18 -07:00
Joe Onorato
ef9bc11ddb Merge "Add support for null tag names from apps." into nyc-dev
am: 9a916e5

* commit '9a916e5602908f579ac846680270677c5a89e5a4':
  Add support for null tag names from apps.

Change-Id: Iff0ce8b4faeb935e70ce9bef6fba322707e5aa7d
2016-04-14 21:17:03 +00:00
Joe Onorato
9a916e5602 Merge "Add support for null tag names from apps." into nyc-dev 2016-04-14 21:10:16 +00:00
Oren Blasberg
672d0e762d Merge "Don\'t show icons in overlay popup menus." into nyc-dev
am: 203222e

* commit '203222ea6077c1e0155971fee1cb6917b8055117':
  Don't show icons in overlay popup menus.

Change-Id: I7abab9b6fb52ca17a811a0917f4955db9c9393e7
2016-04-14 20:46:36 +00:00