Commit Graph

8622 Commits

Author SHA1 Message Date
Rubin Xu
3ad94d299d Merge \"Fix typo in DevicePolicyManager\" into nyc-mr1-dev
am: 74eb4a5226

Change-Id: I790597626c960f2e9cb3ffcac20f77fc2e001075
2016-07-14 09:55:48 +00:00
Rubin Xu
74eb4a5226 Merge "Fix typo in DevicePolicyManager" into nyc-mr1-dev 2016-07-14 09:46:23 +00:00
Selim Cinek
46aeea5dc1 Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
am: a7ebd4f4bb

Change-Id: Id3ffe5addb5e036eeda993d8dd6603b88c785804
2016-07-14 01:58:52 +00:00
TreeHugger Robot
a7ebd4f4bb Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
* changes:
  Fixed a bug where the headsup would be stuck disappearing
  Changed the appearance of phone call notifications
2016-07-14 01:38:53 +00:00
Wei Liu
05c2c22a80 Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev
am: 6e8630307a

Change-Id: I7e381d5d62f9c79b0c604518ff6ea2d1d9c38dc4
2016-07-14 00:08:07 +00:00
Wei Liu
6e8630307a Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev 2016-07-13 23:59:28 +00:00
Selim Cinek
06e9e1fe00 Changed the appearance of phone call notifications
Change-Id: Ibf8f9b266428fdd5374ee824ec4c2df10daeb9a7
Fixes:28269355
2016-07-13 14:56:05 -07:00
Adrian Roos
f1d5c81aa0 Merge \"ApplicationErrorReport: Sanitize stack trace\" into nyc-mr1-dev
am: a07af1ee35

Change-Id: I26689370456dd424474683fca95950bd229bbe73
2016-07-13 21:39:59 +00:00
Adrian Roos
a07af1ee35 Merge "ApplicationErrorReport: Sanitize stack trace" into nyc-mr1-dev 2016-07-13 21:34:19 +00:00
Rubin Xu
d3609d4cc3 Fix typo in DevicePolicyManager
Change-Id: I4aa9530794f1487d17765a532ad65a303f4f7ff8
Fix: 30115660
2016-07-13 18:32:57 +01:00
Adrian Roos
732ae95fbf ApplicationErrorReport: Sanitize stack trace
Makes sure that the size of the stack trace does not exceed
40 KiBi, to ensure that even errors with large stack traces
are properly reported to ActivityManagerService. For good
measure, also ensure that the exception message is not too
long either.

Change-Id: Id8a99094023c15a981b1b79fd9ee0d803921e220
Fixes: 29918978
2016-07-13 17:25:18 +00:00
Benjamin Franz
b3fa8d87e0 Merge \"Add hidden API to store whether provisioning config has been applied\" into nyc-mr1-dev
am: 17ca90430b

Change-Id: Ibd92d09022e534df20405af19763d1156f797b4e
2016-07-13 14:35:59 +00:00
Benjamin Franz
17ca90430b Merge "Add hidden API to store whether provisioning config has been applied" into nyc-mr1-dev 2016-07-13 14:31:50 +00:00
Fyodor Kupolov
1028c16d76 Merge \"Don\'t hold a lock while loading default wallpaper\" into nyc-mr1-dev
am: 2921dfac50

Change-Id: Iaa22bed019f30b340d7ef7011c2d8b14629efe33
2016-07-12 19:30:08 +00:00
TreeHugger Robot
2921dfac50 Merge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev 2016-07-12 19:18:08 +00:00
Amith Yamasani
b493ce833b Merge \"Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am: e278cf7665\" into nyc-mr1-dev
am: d2e6a62838

Change-Id: I5d11b5f95bab3f5b581f0fab176efc5c349adb55
2016-07-12 17:55:05 +00:00
Amith Yamasani
3bfbc531b3 Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am: e278cf7665

Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624
2016-07-12 17:46:58 +00:00
Fyodor Kupolov
b6378cf4ae Don't hold a lock while loading default wallpaper
It currently causes lock contention during user switch, when instance of
WallpaperManager in SystemUI is accessed from multiple threads

Bug: 29039588
Change-Id: I4b827d54d10fbd3b188fb94f47e78a2967ecb480
2016-07-12 10:39:56 -07:00
Makoto Onuki
b1e0982173 Merge \"Throw ActivityNotFoundException when failed to launch shortcut\" into nyc-mr1-dev
am: 50752f7391

Change-Id: I0dcb7b89a32de22dee41ebe617e47ae935ac8227
2016-07-12 17:14:56 +00:00
Makoto Onuki
50752f7391 Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev 2016-07-12 17:09:32 +00:00
Benjamin Franz
2aa9bab8a1 Add hidden API to store whether provisioning config has been applied
Bug: 29629204
Change-Id: Iaf4164357868b17dbc6615a77babb0e7cbc183b7
2016-07-12 17:20:18 +01:00
Mahaver Chopra
325af20235 Merge \"Add an api to verify if ro.device_owner was set\" into nyc-mr1-dev
am: c1182a8128

Change-Id: I6fecc2edf4ba78d60f509679c0b9b5367305f310
2016-07-12 09:54:59 +00:00
Amith Yamasani
75db125ebb Include new constant for encryption status in the getter's javadoc
Added a bit more information in the javadocs about the new constant
ENCRYPTION_STATUS_ACTIVE_PER_USER in related methods/constants so
that developers don't miss checking for that constant when targeting
API Level 24.

Change-Id: Id9cd6248637fe0fc28d5161344abe02614b5f502
Fixes: 30073719
2016-07-11 15:02:18 -07:00
Makoto Onuki
83f6d2da37 Throw ActivityNotFoundException when failed to launch shortcut
Originally the code used IIntentSender, but I had to switch to calling
startActivitiesInPackage() directly, because sendIntentSender() does
not support returning errors.

Bug 30035853

Change-Id: I5d7669c96a2f1805373c71aebf45b97ac1d01ff6
2016-07-11 14:37:18 -07:00
Mahaver Chopra
790d198860 Add an api to verify if ro.device_owner was set
Currently for OobConfig app we used DEVICE_PROVISIONED Global setting to
verify if device was provisioned. This setting can be modified using
adb. we just need to know if it was set atleast once. Added an api in
DPM to return whether system property "ro.device_owner" was set.

Bug: 29935702
Change-Id: I9a2b5217c0bc2cc11d68282e05a5450ea3f6cf21
2016-07-11 11:22:52 +01:00
Wei Liu
967fc8dd62 Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.
b/30041885

Change-Id: I4ffa7b5c8ddad35e32f0f31ce904848ff40ad734
2016-07-08 17:08:26 -07:00
Jorim Jaggi
0483184454 Merge \"Preparations for different scrim depending on wallpaper\" into nyc-mr1-dev
am: 702589d060

Change-Id: I32c188034c773836ade46ddab63606e7e88400de
2016-07-08 22:19:42 +00:00
TreeHugger Robot
702589d060 Merge "Preparations for different scrim depending on wallpaper" into nyc-mr1-dev 2016-07-08 22:13:51 +00:00
Andreas Gampe
5c1dc014ca Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev
am: 56177bf81b

Change-Id: I7ee938b31784d093680783c1988a68cc803cce3f
2016-07-08 18:19:33 +00:00
Andreas Gampe
56177bf81b Merge "Revert "Frameworks/base: Refactor UserHandle and Environment a bit"" into nyc-mr1-dev 2016-07-08 18:09:54 +00:00
Andreas Gampe
d281b4204a Revert "Frameworks/base: Refactor UserHandle and Environment a bit"
Breaks monkey in root mode.

This reverts commit 6e16714c68.

Bug: 29338430
Change-Id: I238f89dad77d7dcae6d02eccbda52eb9c6c6466c
2016-07-08 03:50:27 +00:00
Tim Murray
03b34e402c Merge changes from topic \'fifo\' into nyc-mr1-dev
am: a96d445aef

Change-Id: If4a5c3f65cb611aecf82ad49ad6d992f098cbfb1
2016-07-07 20:48:27 +00:00
Tim Murray
a96d445aef Merge changes from topic 'fifo' into nyc-mr1-dev
* changes:
  Add new mode for SCHED_FIFO on UI and RenderThreads.
  Add isThreadInProcess.
2016-07-07 20:29:24 +00:00
Tim Murray
33eb07f575 Add new mode for SCHED_FIFO on UI and RenderThreads.
Add a new mode, controlled by sys.use_fifo_ui property, that enables the
top app's UI and RenderThread to be SCHED_FIFO. This eliminates almost
all jank due to scheduling competition with non-UI critical
threads. This mode may not be suitable for all devices.

bug 24503801

Change-Id: I7b8a31830ad80f7efa00236928d5476998ed4e00
2016-07-07 12:55:31 -07:00
Jorim Jaggi
e31f6b8024 Preparations for different scrim depending on wallpaper
- Allow wallpaper info to be queried by user
- Refactor ScrimController for extensibility

Bug: 28936996
Change-Id: Ib019331a844110f1f24f35d225d2648626545233
2016-07-06 14:42:25 -07:00
Jeff Sharkey
fd6071215e Merge \"Don\'t cache external storage directories.\" into nyc-mr1-dev
am: d683945251

Change-Id: I67dbd3da95b5134bf013ca3deb51fd00b47d94cd
2016-07-06 20:54:48 +00:00
TreeHugger Robot
d683945251 Merge "Don't cache external storage directories." into nyc-mr1-dev 2016-07-06 20:47:51 +00:00
Andreas Gampe
9b4725d071 Merge \"Frameworks/base: Refactor UserHandle and Environment a bit\" into nyc-mr1-dev
am: e6fcebbf50

Change-Id: Ib6be1e72ad9b0350256ec208c6aee051b746f9d0
2016-07-06 19:57:08 +00:00
Andreas Gampe
6e16714c68 Frameworks/base: Refactor UserHandle and Environment a bit
Refactor slightly to forbid using myUserId in the zygote (uid == 0).
Also factor Environment to put user data (vs shared data) into its
own class, which should keep the page the shared data is on actually
shared between processes.

Bug: 29338430
Change-Id: I05d1306b57658a83299e38076171f56cb364ea80
2016-07-06 18:07:44 +00:00
Robert Carr
0dbe6db014 Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev
am: 30efa24b11

Change-Id: I9ed6ae1f45221ff702162a1608bb8db7059058f5
2016-07-01 19:38:49 +00:00
TreeHugger Robot
30efa24b11 Merge changes I38cff63b,Id3739bbc,If052cd8c into nyc-mr1-dev
* changes:
  Fix synchronization error for Seamless rotation.
  Disable seamless rotation while animating.
  Force CROSSFADE rotation when launching from double tap gesture.
2016-07-01 19:27:36 +00:00
Robert Carr
fd10cd1989 Force CROSSFADE rotation when launching from double tap gesture.
When activity transition triggers a rotation change, the starting
window will normally be the top window at the time we try
to select the window animation. However, these layout params won't
have the apps rotation animation set (as the client code will set that
on the real window, not the starting window). Eventually we would
like to add API to specify rotation animation via manifest to solve
this problem cleanly. In the mean time, we can force a specific rotation
animation from the double tap gesture, and clean up some camera
ugliness. We accomplish this by attaching an animation hint to
ActivityOptions.

Bug: 28838855
Change-Id: If052cd8cbae76651da43f3b4c590cd9dcc1afc0f
2016-07-01 11:05:40 -07:00
Adrian Roos
fa42bb3fa5 Merge \\"Fix missing header text in notification groups\\" into nyc-dev am: a275ec269f
am: 1b7dbd9253

Change-Id: I007196bd1e93e3a89768b58f688e9a600694174f
2016-06-30 23:18:29 +00:00
Adrian Roos
1b7dbd9253 Merge \"Fix missing header text in notification groups\" into nyc-dev
am: a275ec269f

Change-Id: Ib2dc310b57756218d0851d7aff6a0ea183714f5d
2016-06-30 23:07:40 +00:00
Adrian Roos
78f525b674 Merge \"Fix missing header text in notification groups\" into nyc-dev
am: a275ec269f

Change-Id: Ida3c3f33c63aa904d34c864899ddc8aac0368394
2016-06-30 23:07:39 +00:00
Adrian Roos
9dfb78fab6 Fix missing header text in notification groups
Fixes a case where notification header text could go missing
if a notification view was recycled and previously had a header text.

Reapplying only hid the text without clearing it, so the extraction
logic thought it was still there and hid the text for the children
even though it was not showing for the parent.

Change-Id: I3f96e1e7bebb2f815020d278ad13b2b5d948e63c
Fixes: 29915184
2016-06-30 15:46:15 -07:00
Makoto Onuki
20a9ca9311 Merge \"Start shortcuts as if publisher apps did using PendingIntent\" into nyc-mr1-dev
am: 60efbf2586

Change-Id: If43a09cd1580edb318404f56459b8557b69b7d5a
2016-06-30 21:55:18 +00:00
Makoto Onuki
60efbf2586 Merge "Start shortcuts as if publisher apps did using PendingIntent" into nyc-mr1-dev 2016-06-30 21:45:05 +00:00
Srinath Sridharan
75c6078c8b Merge \"Add a new API to improve VR thread scheduling.\" into nyc-mr1-dev
am: 5e261441d3

Change-Id: Ie7c734ca22abad05a4f0800a1dba9553eb7cbfef
2016-06-30 18:19:47 +00:00
Tim Murray
5e261441d3 Merge "Add a new API to improve VR thread scheduling." into nyc-mr1-dev 2016-06-30 18:05:57 +00:00