Commit Graph

6108 Commits

Author SHA1 Message Date
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
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
Oren Blasberg
203222ea60 Merge "Don't show icons in overlay popup menus." into nyc-dev 2016-04-14 20:34:54 +00:00
Amith Yamasani
bb541ffe5e Merge "Multi-window assist callback" into nyc-dev
am: 0d723a2

* commit '0d723a2a4d83db5f01aa5a21f3cbd9d2b608bced':
  Multi-window assist callback

Change-Id: I4a0564800bb4c7a19a415ff109836827c4feb0e7
2016-04-14 19:12:57 +00:00
Amith Yamasani
0d723a2a4d Merge "Multi-window assist callback" into nyc-dev 2016-04-14 19:06:40 +00:00
Joe Onorato
388fc336b3 Add support for null tag names from apps.
For Wakelocks and syncs there is no requirement that an app actually
supply a tag/name.  Jobs will always have system-supplied tags.

Bug: 26276001
Change-Id: Ie3b8e48a395de1506a2f15d5b9c9eab726bc6d0a
2016-04-14 11:46:56 -07:00
Oren Blasberg
3610d06239 Don't show icons in overlay popup menus.
This was a "regression" in CascadingMenuPopup specifically.
We now check for the overflow case and don't show icons.
This preserves the behavior from Marshmallow.

Bug: 28026351
Change-Id: Ifbc9a20b0dadd19ef7b727023b1b0cfa45ebf993
2016-04-14 11:14:09 -07:00
Alan Viverette
3b049bb17f Merge "Add scroll indicators to resolver list" into nyc-dev
am: 8bb7ad5

* commit '8bb7ad598560fda42ec256f02ba69cf54b433a85':
  Add scroll indicators to resolver list

Change-Id: I8b6dbcd2ff106bf83945084b1a4956c094234240
2016-04-14 01:49:33 +00:00
Alan Viverette
8bb7ad5985 Merge "Add scroll indicators to resolver list" into nyc-dev 2016-04-14 01:45:35 +00:00
Amith Yamasani
e8222e551f Multi-window assist callback
Introducing a new callback in VoiceInteractionSession to
provide assist data for additional activities in the
foreground in a multiwindow setup.

PIP, docked windows and free-form windows (top-most)
will be queried for assist data and passed through the
new API to the Voice Interaction service.

Bug: 27718385

Change-Id: Ib4427c304611b75c2078dcb54f1f7e47ae7d9cfa
2016-04-13 17:12:29 -07:00
Adrian Roos
69df48c446 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev
am: c142a8c

* commit 'c142a8c43fa7d1b6c9d797e044060755d9ecfcd6':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Id81115f8311e797f0b7d8a435226ea5862a9550a
2016-04-14 00:08:08 +00:00
TreeHugger Robot
c142a8c43f Merge "StrongAuthTracker: Don't rely on USER_PRESENT" into nyc-dev 2016-04-14 00:04:54 +00:00
Adrian Roos
4ab7e595a5 StrongAuthTracker: Don't rely on USER_PRESENT
USER_PRESENT is sent via the background queue. A delay
there can cause us not to recognize that the user has
unlocked and prompt for the credential again, when trust
or fingerprint would be sufficient.

Also removes an obsolete reference to USER_PRESENT from
TrustManagerService.

Change-Id: Ie8d1a180170df5f0c8f9e71660504fd71eeacd99
Fixes: 27830458
2016-04-13 15:38:18 -07:00
Henrik Engström
7d7a075ec9 Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev
am: 651e09f

* commit '651e09fdc1b4c26dc7661e1ab127276656ece041':
  Make ResolverActivity respect selector intent when making filters

Change-Id: I4bf1b16e6afb07c7c9bd0172539efa32dc14724e
2016-04-13 21:46:07 +00:00
Adam Powell
651e09fdc1 Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev 2016-04-13 21:35:33 +00:00
Wale Ogunwale
361124ef08 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev
am: 3fb1c81

* commit '3fb1c81394f98b025b488774916b7580f9e31dab':
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.

Change-Id: If788ed4af5292b76576c7abd728633f20cc6eb93
2016-04-13 17:07:38 +00:00
Wale Ogunwale
3fb1c81394 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev
* changes:
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.
2016-04-13 16:59:36 +00:00
Henrik Engström
3277cf1ea4 Make ResolverActivity respect selector intent when making filters
When the ResolverActivity makes a filter after an intent is chosen,
either for remembering last used or an "always use" choice for the
user it doesn't consider the selector in the intent if present.

This means that when a resolver activity is launched for an intent
with a selector, the selector is used for resolving preferred
activities, and for populating the list, but when the same intent
is sent again it doesn't match the filter created by the previous
ResolverActivity.

This in turn means that the user will get another ResolverActivity
even if "Always Use" was chosen the last time.

Bug: 28129216

Change-Id: I29be7010e7c890caf9789673b3c3f821ba362761
2016-04-13 08:45:29 -07:00
Alan Viverette
b0e22ecf7d Add scroll indicators to resolver list
Also reformats resolver list XML.

Bug: 27431395
Change-Id: I582448a01747b29fc6ac61dd80e27e6679507a81
2016-04-13 10:23:35 -04:00
Philip P. Moltmann
d516393865 Merge "Set label for links to resolver activities." into nyc-dev
am: d1b8d6d

* commit 'd1b8d6d342d049e00d9a304c291c6c024aa3c0a0':
  Set label for links to resolver activities.

Change-Id: Iaf7e59bdca4a25b347661bed7b927b8100dcac96
2016-04-13 00:17:54 +00:00