Commit Graph

7290 Commits

Author SHA1 Message Date
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
Jeff Sharkey
7368938550 Merge "Make BackupManager encryption aware." 2016-02-18 17:38:42 +00:00
Julia Reynolds
ef37f28436 Remove Notification Topics.
Bug: 23220370
Change-Id: Ifbcdbab1cf6974c192483091512f75762784a98e
2016-02-18 08:55:33 -05:00
Esteban Talavera
c1c8359072 Update DevicePolicyManager parent instance documentation
Update documentation for the DevicePolicyManager regarding APIs
that can be called on the DPM's parent instance.

Bug: 26903406
Bug: 27065927
Change-Id: I45cb8de0ab9ad26812ba502820264b68c36c88fd
2016-02-18 13:42:52 +00:00
Julia Reynolds
d4ea741d66 Inflate and strip remote views for pre-N apps.
Bug: 27120291
Change-Id: I4e1497222f3787e68c3e385e45ab6a7c23799917
2016-02-18 08:35:45 -05:00
Antonio Cansado
cd42acd951 Implementation of data usage callbacks.
NetworkStatsService will register data usage requests
and keep data usage stats scoped to the request.

There are different types of data usage requests
- scoped to a set of NetworkTemplate; these are restrictred to
device owners and carrier apps and allow the caller to monitor
all activity on the specified interfaces.
- scoped to all uids visible to the user, if the user has
android.Manifest.permission#PACKAGE_USAGE_STATS permission.
The set of uids may change over time, so we keep track of that.
- scoped to a set of uids given by the caller, granted that
the caller has access to those uids.
- scoped to the caller's own data usage. This doesn't require
PACKAGE_USAGE_STATS.

Bug: 25812785
Change-Id: Ie11f35fc1f29d0dbe82f7fc924b169bb55c76708
2016-02-17 18:43:53 -08:00
Winson
30a969b513 Only set the task description if the colors are opaque. am: 2d47683ab9
am: 07801468b2

* commit '07801468b2b1c61e2fcb0a12516e1b3d1de5a466':
  Only set the task description if the colors are opaque.
2016-02-18 00:24:00 +00:00
Winson
07801468b2 Only set the task description if the colors are opaque.
am: 2d47683ab9

* commit '2d47683ab969a1da30209e44712ce6513e324b89':
  Only set the task description if the colors are opaque.
2016-02-18 00:18:06 +00:00
Makoto Onuki
933f3d03c3 Merge "[framework] Don\'t allow apps on external storage to be active admin" into nyc-dev am: fc482c30b7
am: d55874a6e2

* commit 'd55874a6e2a98527d32b148d8ea097e9dea319e3':
  [framework] Don't allow apps on external storage to be active admin
2016-02-18 00:00:11 +00:00
Makoto Onuki
d55874a6e2 Merge "[framework] Don\'t allow apps on external storage to be active admin" into nyc-dev
am: fc482c30b7

* commit 'fc482c30b7a3c2cf7bc14d5c86de758a16f6433d':
  [framework] Don't allow apps on external storage to be active admin
2016-02-17 23:51:15 +00:00
Jeff Sharkey
5808319629 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-17 16:34:29 -07:00
Winson
2d47683ab9 Only set the task description if the colors are opaque.
Bug: 27214638
Change-Id: I75e0b8871087f0b8e6acd16dc751bb6374c0f968
2016-02-17 23:23:45 +00:00
Makoto Onuki
fc482c30b7 Merge "[framework] Don't allow apps on external storage to be active admin" into nyc-dev 2016-02-17 22:48:13 +00:00
Makoto Onuki
f34db0a17e [framework] Don't allow apps on external storage to be active admin
Bug 27149287

Change-Id: I6d959d2e66dc0b19f78e6135fbdcf45ca8551958
2016-02-17 14:24:25 -08:00
Amith Yamasani
f886598679 Merge "Clean up App Standby code" into nyc-dev am: 0137c3daf4
am: 4dcb319701

* commit '4dcb3197011c5fe75a3a39d436423689af27227a':
  Clean up App Standby code
2016-02-17 22:21:55 +00:00
Amith Yamasani
4dcb319701 Merge "Clean up App Standby code" into nyc-dev
am: 0137c3daf4

* commit '0137c3daf4bdd3154b71d9b34536960c424fc422':
  Clean up App Standby code
2016-02-17 22:01:27 +00:00
Amith Yamasani
0137c3daf4 Merge "Clean up App Standby code" into nyc-dev 2016-02-17 21:50:32 +00:00