Commit Graph

7306 Commits

Author SHA1 Message Date
Vadim Tryshev
e6174c6aab Merge "Add Wallpaper.getBitmapAsUser()" into nyc-dev am: a6a127747a
am: 935755cc3b

* commit '935755cc3b77108eba971bd114a1facaaa6c9547':
  Add Wallpaper.getBitmapAsUser()
2016-02-20 01:03:33 +00:00
Vadim Tryshev
935755cc3b Merge "Add Wallpaper.getBitmapAsUser()" into nyc-dev
am: a6a127747a

* commit 'a6a127747ae04c12966737b3792dc5df4402c292':
  Add Wallpaper.getBitmapAsUser()
2016-02-20 00:20:30 +00:00
Vadim Tryshev
a6a127747a Merge "Add Wallpaper.getBitmapAsUser()" into nyc-dev 2016-02-20 00:11:41 +00:00
Selim Cinek
65d25ad4d2 Merge "Add support for custom media notifications" into nyc-dev am: c68190ae90
am: 147ad1680b

* commit '147ad1680bc313f3b30abad7e78db174b7499227':
  Add support for custom media notifications
2016-02-19 23:42:35 +00:00
Selim Cinek
0d9b9bdcb4 Merge "Cleaned up the logic for the picture end margin" into nyc-dev am: 54c857cda6
am: 9867f9ae34

* commit '9867f9ae3425fb355b21dd818737e290444cdc2a':
  Cleaned up the logic for the picture end margin
2016-02-19 23:40:46 +00:00
Selim Cinek
147ad1680b Merge "Add support for custom media notifications" into nyc-dev
am: c68190ae90

* commit 'c68190ae903685a8243e82f94c03c325ba00e121':
  Add support for custom media notifications
2016-02-19 23:19:35 +00:00
Selim Cinek
9867f9ae34 Merge "Cleaned up the logic for the picture end margin" into nyc-dev
am: 54c857cda6

* commit '54c857cda62fbd3a86f5a74924fcea23b89bb1f5':
  Cleaned up the logic for the picture end margin
2016-02-19 23:17:45 +00:00
Selim Cinek
10bfbf6261 Merge "Added the possibility to show custom notifications decorated." into nyc-dev am: 3c306d8acd
am: 3145572f64

* commit '3145572f64eed125d8eba856a4552e98d61af263':
  Added the possibility to show custom notifications decorated.
2016-02-19 23:16:59 +00:00
Selim Cinek
3145572f64 Merge "Added the possibility to show custom notifications decorated." into nyc-dev
am: 3c306d8acd

* commit '3c306d8acdb34b667ad55ad30a9a2119cad0e0ab':
  Added the possibility to show custom notifications decorated.
2016-02-19 23:09:22 +00:00
Selim Cinek
c68190ae90 Merge "Add support for custom media notifications" into nyc-dev 2016-02-19 23:04:42 +00:00
Selim Cinek
54c857cda6 Merge "Cleaned up the logic for the picture end margin" into nyc-dev 2016-02-19 23:04:26 +00:00
Selim Cinek
3c306d8acd Merge "Added the possibility to show custom notifications decorated." into nyc-dev 2016-02-19 23:03:38 +00:00
Yorke Lee
dcd93cc21a Add Wallpaper.getBitmapAsUser()
Add a new API to allow a wallpaper bitmap to be obtained for
a specific user.

Without this API, using only getWallpaperFile(..., userId), one
can't get a default wallpaper bitmap if the wallpaper is not set.

Bug: 25185253
Change-Id: Ibe1e9a49d22bee08fd4bed415573c1ee28526aea
2016-02-19 14:47:39 -08:00
Selim Cinek
03eb3b7c44 Add support for custom media notifications
Custom media notifications can now also be decorated by the system
instead of going fully custom.

Bug: 26961842
Change-Id: I1d85a652b93f10988939b471a14b372671acfaf1
2016-02-19 11:54:42 -08:00
Selim Cinek
247fa01931 Cleaned up the logic for the picture end margin
This allows decorated custom remote views to be properly
showing with a large image.

Bug: 24866646
Change-Id: Ie355e503437f19ace2503d42f44bee4bd22f03c8
2016-02-19 11:54:41 -08:00
Selim Cinek
593610c248 Added the possibility to show custom notifications decorated.
Bug: 26961842
Change-Id: I3966a4e6ecb05b9f284ec5b244b2594f78bcb337
2016-02-19 11:52:12 -08:00
Julia Reynolds
53faf747f6 Merge "Remove Notification Topics." into nyc-dev am: 73d96fb4bb
am: f7f055e407

* commit 'f7f055e40709d8de6bad8f4384f4dc59adceb213':
  Remove Notification Topics.
2016-02-19 19:32:13 +00:00
Julia Reynolds
f7f055e407 Merge "Remove Notification Topics." into nyc-dev
am: 73d96fb4bb

* commit '73d96fb4bbe1e3796e655314619bf9897d07c929':
  Remove Notification Topics.
2016-02-19 19:25:04 +00:00
Julia Reynolds
73d96fb4bb Merge "Remove Notification Topics." into nyc-dev 2016-02-19 19:17:25 +00:00
Svetoslav Ganov
8cc04de85f Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev am: 5350306989
am: d24ac9abd6

* commit 'd24ac9abd617c5c1753dd1f8c662e42c4207e94e':
  Don't hold a lock while reading shared preferences from disk.
2016-02-19 17:21:58 +00:00
Svetoslav Ganov
d24ac9abd6 Merge "Don\'t hold a lock while reading shared preferences from disk." into nyc-dev
am: 5350306989

* commit '53503069895918a59a305addaac84ea11937edcf':
  Don't hold a lock while reading shared preferences from disk.
2016-02-19 17:17:48 +00:00
Svetoslav Ganov
5350306989 Merge "Don't hold a lock while reading shared preferences from disk." into nyc-dev 2016-02-19 17:12:40 +00:00
Svet Ganov
96db26032e Don't hold a lock while reading shared preferences from disk.
Shared prefrences loads thir content from disk on a separate
thread to improve performance, however it holds the lock
the whole time  while reading from disk which as a result blocks
operations that don't rely on reading data from being performed
intil load completes, e.g. reguistering a prefernces change
listener does not depend on having the data loaded.

bug:5254577

Change-Id: I5ad67b285631c34d5aadac7138ba8bfaa728cf94
2016-02-19 09:11:39 -08:00
Esteban Talavera
0bd7f498af Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev am: 44da29407f
am: d76c5fedc8

* commit 'd76c5fedc84f5d2acd18a56060f47c6701d2d8ca':
  Update DevicePolicyManager parent instance documentation
2016-02-19 09:45:57 +00:00
Esteban Talavera
d76c5fedc8 Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev
am: 44da29407f

* commit '44da29407f3228811d5c1387a184fc68c388c5c7':
  Update DevicePolicyManager parent instance documentation
2016-02-19 09:42:28 +00:00
Esteban Talavera
44da29407f Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev 2016-02-19 09:37:23 +00:00
Colin Cross
41bf778441 resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp
am: 4bf50e486f

* commit '4bf50e486f85d7a9630ded3e36216710c9d1f97d':
  Add dumpsys meminfo --unreachable
2016-02-19 06:32:06 +00:00
Colin Cross
4bf50e486f resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp
Change-Id: Ifdf52646440b65ca4b3aadc8bba212b5f1fd0c0d
2016-02-18 22:27:04 -08:00
Colin Cross
bd45c08468 Merge "Add dumpsys meminfo --unreachable"
am: 916ea08119

* commit '916ea081196a47ef3257910a71fa7a7ac609ddb1':
  Add dumpsys meminfo --unreachable
2016-02-19 06:14:50 +00:00
Colin Cross
916ea08119 Merge "Add dumpsys meminfo --unreachable" 2016-02-19 06:10:36 +00:00
Svetoslav Ganov
8032741bdc Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev am: 0f3431b616
am: 8a20395156

* commit '8a203951566e6e5df730c49fb35054a851eb8834':
  Improve requestPermissions API docs and throw correct exception.
2016-02-19 04:16:19 +00:00
Svetoslav Ganov
8a20395156 Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev
am: 0f3431b616

* commit '0f3431b616e03fe76cb52cabad209f95e1d7899c':
  Improve requestPermissions API docs and throw correct exception.
2016-02-19 04:10:02 +00:00
Svetoslav Ganov
0f3431b616 Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev 2016-02-19 04:03:50 +00:00
Svet Ganov
f66381cd0d Improve requestPermissions API docs and throw correct exception.
bug:26220898

Change-Id: Iebda3fe13b963b10829de917fb00a9a14186b72c
2016-02-18 20:02:40 -08:00
Dianne Hackborn
c0e1a23a26 Merge "Implement lenient background check option." 2016-02-19 00:29:54 +00:00
Adam Powell
dbc45f3778 Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev am: 35c8e0fcf2
am: e0967f875e

* commit 'e0967f875ebf080b4231a56e7252905c334fe7dc':
  Fix NPE for Fragment#setUserVisibleHint(true)
2016-02-18 23:58:46 +00:00
Adam Powell
e0967f875e Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev
am: 35c8e0fcf2

* commit '35c8e0fcf2e26f24ac21bb3df87158d4a0f4587f':
  Fix NPE for Fragment#setUserVisibleHint(true)
2016-02-18 23:53:06 +00:00
Adam Powell
35c8e0fcf2 Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev 2016-02-18 23:44:15 +00:00
Adam Powell
255b008afe Fix NPE for Fragment#setUserVisibleHint(true)
Fix a bug where calling setUserVisibleHint(true) before adding a
Fragment to a FragmentManager could cause a crash.

Bug 27250018

Change-Id: Id192ae31bab95f15d32de9f105e707bdb8691641
2016-02-18 15:17:29 -08:00
Christopher Tate
a836c545c3 Keyguard wallpaper am: be132e6ea4
am: 15e95000b1

* commit '15e95000b18086fc4f5dd948207a8fa863492852':
  Keyguard wallpaper
2016-02-18 23:16:51 +00:00
Christopher Tate
15e95000b1 Keyguard wallpaper
am: be132e6ea4

* commit 'be132e6ea494023d4b8c37658a34efa8b705dce9':
  Keyguard wallpaper
2016-02-18 23:10:07 +00:00
Christopher Tate
be132e6ea4 Keyguard wallpaper
Clients can now set a lock-only wallpaper that Keyguard can
observe and choose to draw as appropriate.

Bug 25454162

Change-Id: I3fc30e02919e814b55dfded2a1a36ad9d2e55299
2016-02-18 15:01:02 -08:00
Dianne Hackborn
72bea4a1f0 Implement lenient background check option.
Which really means, make background check much more
strict, with an option to revert to the more lenient
behavior.

In this strict version, an app can't have services
started or receive broadcasts at any point when it is
not foreground.  Also, it doesn't matter the importance
of a caller trying to start a service, it only depends
on the state of the app whose service is being started.

A new activity shell command allows you to control
whether to use the strict or lenient behavior.

Change-Id: I660df480dd55575a38c9542210210ec53e34eca0
2016-02-18 13:42:52 -08:00
Antonio Cansado
c607d1db22 Merge "Implementation of data usage callbacks." into nyc-dev am: 12d7ea815b
am: 7e098af672

* commit '7e098af67280dbc877790486043998b13e83986e':
  Implementation of data usage callbacks.
2016-02-18 21:12:15 +00:00
Antonio Cansado
7e098af672 Merge "Implementation of data usage callbacks." into nyc-dev
am: 12d7ea815b

* commit '12d7ea815b772b1013f9f5a583d296701a702a0c':
  Implementation of data usage callbacks.
2016-02-18 20:53:58 +00:00
Jeff Sharkey
3825dcd754 Merge "Make BackupManager encryption aware." into nyc-dev
am: 003ee19851

* commit '003ee198518490c9572e610ddc21e8b3a024364c':
  Make BackupManager encryption aware.
2016-02-18 20:52:48 +00:00
Antonio Cansado
12d7ea815b Merge "Implementation of data usage callbacks." into nyc-dev 2016-02-18 19:43:42 +00:00
Julia Reynolds
487295103d Merge "Inflate and strip remote views for pre-N apps." into nyc-dev am: 4bb2de2557
am: 3c2ed58ff0

* commit '3c2ed58ff01b5443c6d29f5bf873a28062fe0715':
  Inflate and strip remote views for pre-N apps.
2016-02-18 19:00:55 +00:00
Julia Reynolds
3c2ed58ff0 Merge "Inflate and strip remote views for pre-N apps." into nyc-dev
am: 4bb2de2557

* commit '4bb2de255733d48cbb21587fa4ab0eb4eacee943':
  Inflate and strip remote views for pre-N apps.
2016-02-18 18:40:09 +00:00
Jeff Sharkey
2c1ba9a961 Make BackupManager encryption aware.
Backup requires both CE and DE storage to be available, so delay
spinning up the backup system until the user is unlocked, since
that's when CE storage becomes available.  Note that devices without
FBE immediately transition USER_SYSTEM into the unlocked state,
since their CE is always available.

Offer to backup and restore files under both CE and DE.  Since DE
is effectively the same as CE, most logic is simply duplicated for
now, but it could be simplified in the future.  Since system apps
can force their default storage location to DE, we always build
explicit CE and DE paths.

Add getDataDir() to give clean access to the top-level private data
directory, but disclaim that apps shouldn't create files there.

Bug: 26279618
Change-Id: Ic34a4b330223725db93b1d0f5c9dffc88002c61f
2016-02-18 10:54:11 -07:00