Rubin Xu
5b6e68fd41
Merge \\"Fix typo in DevicePolicyManager\\" into nyc-mr1-dev am: 74eb4a5226
...
am: 3ad94d299d
2016-07-14 10:05:46 +00:00
Rubin Xu
3ad94d299d
Merge \"Fix typo in DevicePolicyManager\" into nyc-mr1-dev
...
am: 74eb4a5226
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
7c2097fb1f
Merge \"Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am: a7ebd4f4bb\" into nyc-mr1-dev-plus-aosp
...
am: 36c6cf1bdc
2016-07-14 02:06:34 +00:00
Selim Cinek
46aeea5dc1
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
...
am: a7ebd4f4bb
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
2cd9eb7c35
Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am: 6e8630307a
...
am: 05c2c22a80
2016-07-14 00:15:25 +00:00
Wei Liu
05c2c22a80
Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev
...
am: 6e8630307a
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
52396abf56
Merge \\"ApplicationErrorReport: Sanitize stack trace\\" into nyc-mr1-dev am: a07af1ee35
...
am: f1d5c81aa0
2016-07-13 21:45:09 +00:00
Adrian Roos
f1d5c81aa0
Merge \"ApplicationErrorReport: Sanitize stack trace\" into nyc-mr1-dev
...
am: a07af1ee35
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
e4da41e6be
Merge \\"Add hidden API to store whether provisioning config has been applied\\" into nyc-mr1-dev am: 17ca90430b
...
am: b3fa8d87e0
2016-07-13 14:42:22 +00:00
Benjamin Franz
b3fa8d87e0
Merge \"Add hidden API to store whether provisioning config has been applied\" into nyc-mr1-dev
...
am: 17ca90430b
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
62e9a55f82
Merge \\"Don\\'t hold a lock while loading default wallpaper\\" into nyc-mr1-dev am: 2921dfac50
...
am: 1028c16d76
2016-07-12 19:36:32 +00:00
Fyodor Kupolov
1028c16d76
Merge \"Don\'t hold a lock while loading default wallpaper\" into nyc-mr1-dev
...
am: 2921dfac50
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
634841d448
Merge \\"Merge \\\"Include new constant for encryption status in the getter\\\'s javadoc\\\" into nyc-dev am: e278cf7665\\" into nyc-mr1-dev am: d2e6a62838
...
am: b493ce833b
2016-07-12 18:05:39 +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
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
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
be0e56e9d2
Merge \\"Throw ActivityNotFoundException when failed to launch shortcut\\" into nyc-mr1-dev am: 50752f7391
...
am: b1e0982173
2016-07-12 17:19:36 +00:00
Makoto Onuki
b1e0982173
Merge \"Throw ActivityNotFoundException when failed to launch shortcut\" into nyc-mr1-dev
...
am: 50752f7391
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
1f984d7f6b
Merge \\"Add an api to verify if ro.device_owner was set\\" into nyc-mr1-dev am: c1182a8128
...
am: 325af20235
2016-07-12 10:01:00 +00:00
Mahaver Chopra
325af20235
Merge \"Add an api to verify if ro.device_owner was set\" into nyc-mr1-dev
...
am: c1182a8128
2016-07-12 09:54:59 +00:00
Selim Cinek
359c48c805
resolve merge conflicts of 0483184 to master
...
Change-Id: I8466c8d56b5685705591dad7cfb7d439b6dee3d7
2016-07-11 16:59:03 -07: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
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
8f4731db63
Merge \\"Revert \\"Frameworks/base: Refactor UserHandle and Environment a bit\\"\\" into nyc-mr1-dev am: 56177bf81b
...
am: 5c1dc014ca
2016-07-08 18:27:10 +00:00
Andreas Gampe
5c1dc014ca
Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev
...
am: 56177bf81b
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
2016-07-08 03:50:27 +00:00
Tim Murray
aa1735370b
Merge changes from topic \\'fifo\\' into nyc-mr1-dev am: a96d445aef
...
am: 03b34e402c
2016-07-07 20:59:09 +00:00
Tim Murray
03b34e402c
Merge changes from topic \'fifo\' into nyc-mr1-dev
...
am: a96d445aef
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
Jeff Sharkey
3d4ed8b46c
Merge \\"Don\\'t cache external storage directories.\\" into nyc-mr1-dev am: d683945251
...
am: fd6071215e
2016-07-06 22:59:54 +00: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
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
