Makoto Onuki
de1e6e4d2d
Merge \\"Support multiple intents in ShortcutInfo\\" into nyc-mr1-dev am: b84ce2e034
...
am: 9a6109f284
Change-Id: I0f1caf54cc544db0b73f8e3275005923904f57a8
2016-07-20 23:15:32 +00:00
Makoto Onuki
9a6109f284
Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
...
am: b84ce2e034
Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca
2016-07-20 23:09:55 +00:00
Makoto Onuki
b84ce2e034
Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
2016-07-20 23:05:31 +00:00
Makoto Onuki
440a1ea8e2
Support multiple intents in ShortcutInfo
...
Also fix b/30230996.
TODO: Support the sourceBounds argument to LauncherApps.
startShortcut().
Bug 30218829
Bug 30230996
Change-Id: Ibb6c59d5b7c0a320c21d09436d016d0eac94644f
2016-07-20 14:46:48 -07:00
TreeHugger Robot
c5837520ba
Merge "Add per-user versions of set{Component,Application}EnabledSetting."
2016-07-20 18:58:56 +00:00
Sudheer Shanka
0e6bfff6c1
Add per-user versions of set{Component,Application}EnabledSetting.
...
Change-Id: Id63b233308e92a4c360f38d4728c519ac2131ff0
Fixes: 30230444
2016-07-20 10:30:57 -07:00
Svetoslav Ganov
d5fde61c75
Merge \\"Revert \\"Prevent apps to overlay other apps via toast windows\\"\\" into nyc-mr1-dev am: 78fa7a1b3f
...
am: d6c4cf03e3
Change-Id: Iebc613fbecb372dbb39a9110c1b3123150b6ce5d
2016-07-20 03:02:12 +00:00
Svetoslav Ganov
d6c4cf03e3
Merge \"Revert \"Prevent apps to overlay other apps via toast windows\"\" into nyc-mr1-dev
...
am: 78fa7a1b3f
Change-Id: I30b84189b2c2c4566c837cd1b8837053d6944988
2016-07-20 01:12:15 +00:00
Svetoslav Ganov
78fa7a1b3f
Merge "Revert "Prevent apps to overlay other apps via toast windows"" into nyc-mr1-dev
2016-07-20 01:04:52 +00:00
Svetoslav Ganov
f1395d730a
Revert "Prevent apps to overlay other apps via toast windows"
...
This reverts commit b3b22cba86 .
Change-Id: I905e7435893fab49f03fdb708f4ab5a9d2c9cbae
2016-07-20 01:00:51 +00:00
Fyodor Kupolov
4e9af06576
Updated JavaDoc for getApplicationRestrictions
...
The method performs disk I/O and shouldn't be called on the main thread.
Bug: 28303952
Change-Id: Iab4d79158b32858baac4147ab73c6ac7aaa51b5b
2016-07-19 10:28:31 -07:00
Chris Tate
1a83deb584
Merge \\"Document that WallpaperManager.getDrawable() can return null\\" into nyc-mr1-dev am: 3cec9d44b3
...
am: ca0e0b9b6c
Change-Id: Id27ec9541d4075f80a546d3df2bfd7577e38f0fc
2016-07-18 17:54:54 +00:00
Christopher Tate
ca0e0b9b6c
Merge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
...
am: 3cec9d44b3
Change-Id: I72443aa4360cb4c22c9b4faf0cf98b395097757f
2016-07-18 17:44:04 +00:00
Chris Tate
3cec9d44b3
Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
2016-07-18 17:29:39 +00:00
Andrei Stingaceanu
4e750e822f
Merge "Keyboard shortcuts: minor Activity broadcast refactor"
2016-07-18 09:39:52 +00:00
Adrian Roos
ab66a2cd5e
Merge \\"Notification: Apply small icon level\\" into nyc-mr1-dev am: 9d8de73530
...
am: 8b942b2404
Change-Id: I8471581ac27fb1c35126635bdc655b8c8ddea328
2016-07-15 23:25:27 +00:00
Adrian Roos
5810a1c252
Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am: 9a7c3bd577
...
am: 119840eb91
Change-Id: I16436af5b7ada58113d846b9836d302061730177
2016-07-15 23:25:19 +00:00
Svetoslav Ganov
951f0e1d4d
Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am: e2d148b008
...
am: cd263d56d2
Change-Id: I4971baf5ef2a522f8acea091023936e033f23cea
2016-07-15 23:13:59 +00:00
Christopher Tate
41dc83bd57
Document that WallpaperManager.getDrawable() can return null
...
Bug 30164766
Change-Id: Idc03a41ea3fab3772de4f24551765dff78eb6d7f
2016-07-15 15:59:23 -07:00
Adrian Roos
8b942b2404
Merge \"Notification: Apply small icon level\" into nyc-mr1-dev
...
am: 9d8de73530
Change-Id: Iac5f0b6e210355867f79cbc7f48165517ba11a26
2016-07-15 21:16:41 +00:00
Adrian Roos
119840eb91
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
...
am: 9a7c3bd577
Change-Id: Ia5630143df774d76d5867e8e9541775e07e1c5df
2016-07-15 21:16:36 +00:00
Adrian Roos
9d8de73530
Merge "Notification: Apply small icon level" into nyc-mr1-dev
2016-07-15 21:09:37 +00:00
TreeHugger Robot
9a7c3bd577
Merge "Add way to set live wallpaper across users" into nyc-mr1-dev
2016-07-15 21:07:31 +00:00
Svet Ganov
cd263d56d2
Merge \"Prevent apps to overlay other apps via toast windows\" into nyc-mr1-dev
...
am: e2d148b008
Change-Id: I73f802b9b1c4acd5b17c706372f42c9e5d388840
2016-07-15 20:03:33 +00:00
Svetoslav Ganov
e2d148b008
Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev
2016-07-15 19:56:42 +00:00
Adrian Roos
40ea083b59
Add way to set live wallpaper across users
...
Also adds an entry point for vendor specific services
to SystemUI.
Bug: 30038484
Change-Id: I8f335c1f7de15d619f2c688a8ac95372f166595f
2016-07-15 11:20:36 -07:00
Andrei Stingaceanu
a3d2693e05
Keyboard shortcuts: minor Activity broadcast refactor
...
Since the broadcast intents have an action, specifying an explicit
component name is not needed. Specified only the package name and
left it for the system to resolve the full component name for the
receiver that handles the action in that package. Also got rid of
warning: "Calling a method in the system process without a
qualified user" by correctly sending the broadcast as the SYSTEM
user.
Bug: 28012198
Change-Id: Ia572fb1b7f2f3c96160d16e2842d6aff3b7f10a1
2016-07-15 11:12:20 +01:00
Svet Ganov
b3b22cba86
Prevent apps to overlay other apps via toast windows
...
It was possible for apps to put toast type windows
that overlay other apps which toast winodws aren't
removed after a timeout like toasts are.
Now to add a toast window one needs to have a special
token. The token is added by the notificatoion manager
service only for the lifetime of the shown toast and
is then removed including all windows associated with
this token.
This prevents apps to add arbitrary toast windows. The
token is passed in the app domain in the request to
construt and add the toast window which allows a bad
app to add arbitrary toast windows. However, this is
fine since the token will be invalided and all of its
windows removed after the toast for which it was
create times out.
We do not care of braking apps that add toast windows
directly due to the security and privacy implications
of arbitrary UI redressing. Also we have dedicated
Toast APIs which are the way to add this time of UI.
bug:30150688
Change-Id: I65372c81a791489de89fb2886cc96392c28680bb
2016-07-14 19:16:42 -07:00
Jeff Sharkey
96347802ce
Merge \\"Require permission for FLAG_WILL_BE_FOREGROUND.\\" into nyc-mr1-dev am: 97639a1310
...
am: aa8ae41aa5
Change-Id: Icfe17015febaa13823bf9c6d35c33a09d39e7462
2016-07-14 20:22:54 +00:00
Jeff Sharkey
aa8ae41aa5
Merge \"Require permission for FLAG_WILL_BE_FOREGROUND.\" into nyc-mr1-dev
...
am: 97639a1310
Change-Id: I90756b855879cf37bc0bca86844fe99f8a62ef25
2016-07-14 20:14:31 +00:00
TreeHugger Robot
97639a1310
Merge "Require permission for FLAG_WILL_BE_FOREGROUND." into nyc-mr1-dev
2016-07-14 20:05:39 +00:00
Jeff Sharkey
785f494e87
Require permission for FLAG_WILL_BE_FOREGROUND.
...
We caught scheduleAsPackage(), but not schedule(), oops.
Bug: 28998999
Change-Id: I0642c2265ff61eead8747cc6b4d0f852f1ca3ef2
2016-07-14 10:43:14 -06:00
Rubin Xu
5b6e68fd41
Merge \\"Fix typo in DevicePolicyManager\\" into nyc-mr1-dev am: 74eb4a5226
...
am: 3ad94d299d
Change-Id: I3cd6b39d0b979a07a7021dbaf6f7766ea9ebf7e2
2016-07-14 10:05:46 +00:00
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
7c2097fb1f
Merge \"Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am: a7ebd4f4bb\" into nyc-mr1-dev-plus-aosp
...
am: 36c6cf1bdc
Change-Id: I5ecebb835b60f163ad1d6cdff41b30c5590eb8cc
2016-07-14 02:06:34 +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
2cd9eb7c35
Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am: 6e8630307a
...
am: 05c2c22a80
Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029
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
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
52396abf56
Merge \\"ApplicationErrorReport: Sanitize stack trace\\" into nyc-mr1-dev am: a07af1ee35
...
am: f1d5c81aa0
Change-Id: I8ae41d7eb65ad5e3907880df2ca2dcf503735d2d
2016-07-13 21:45:09 +00: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
e4da41e6be
Merge \\"Add hidden API to store whether provisioning config has been applied\\" into nyc-mr1-dev am: 17ca90430b
...
am: b3fa8d87e0
Change-Id: If65317cf6ec5237cff36fba86ed219ab078776ad
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
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