Commit Graph

7219 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Amith Yamasani
ca5d6d2a81 Clean up App Standby code
Don't continue to check idle states for removed / stopped users.
No need to check for uninstalled packages for all users.

Bug: 27208519
Change-Id: I9a3a3bbec560dd380ce90df9fef102d7f62769ca
2016-02-17 13:36:48 -08:00
Edward Cunningham
11b2f01262 Merge "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details." into nyc-dev
am: e619e33b60

* commit 'e619e33b606dbdd885d5379a6f1fd60636ff59a2':
  DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.
2016-02-17 17:55:21 +00:00
Edward Cunningham
e619e33b60 Merge "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details." into nyc-dev 2016-02-17 17:50:45 +00:00
Andrei Stingaceanu
cb4634aa72 Merge "Suspend packages - one call for multiple packages" into nyc-dev
am: 3e7bfe98e0

* commit '3e7bfe98e0727f54fe369bfa6b416e1d040830a7':
  Suspend packages - one call for multiple packages
2016-02-17 15:23:54 +00:00
Andrei Stingaceanu
3e7bfe98e0 Merge "Suspend packages - one call for multiple packages" into nyc-dev 2016-02-17 15:17:35 +00:00
Andrei Stingaceanu
eb84b1843a Suspend packages - one call for multiple packages
Refactor setPackageSuspended into setPackagesSuspended. The rationale
is that the consumers of this API are likely to want to remove
multiple packages at once. Rather than calling the API N times, call
it just once.

The good part is that we already have the broadcast intent for
suspended packages take an array so only one broadcast. Less stress
on the system.

Another good part is that (right now) we only have one consumer of
this API and it will be easy to make changes once this CL goes in.

As a shell command, for consistency only allowed one package at
a time.

Bug: 22776761
Change-Id: Ic8b8cf64d0a288ea3a282bb7b72f9d663b3b0049
2016-02-17 15:14:33 +00:00
Sergey Poromov
05878e0b06 Merge "Fix BackupTransport#getBackupQuota() javadoc." into nyc-dev
am: af11ff0c03

* commit 'af11ff0c03a774324726ade96ef162dbe9f279f4':
  Fix BackupTransport#getBackupQuota() javadoc.
2016-02-17 13:51:20 +00:00
Sergey Poromov
af11ff0c03 Merge "Fix BackupTransport#getBackupQuota() javadoc." into nyc-dev 2016-02-17 13:46:23 +00:00
Andrei Stingaceanu
d09548d408 Merge "Suspend packages - new API for retrieving the suspended status" into nyc-dev
am: 5ae4e73ef0

* commit '5ae4e73ef0747c2d08a901f1a76d8fb8ee64a53a':
  Suspend packages - new API for retrieving the suspended status
2016-02-17 12:03:16 +00:00
Andrei Stingaceanu
5ae4e73ef0 Merge "Suspend packages - new API for retrieving the suspended status" into nyc-dev 2016-02-17 11:57:51 +00:00
Jorim Jaggi
ec8506212c Fix recents transitions
am: 8a5c64062f

* commit '8a5c64062f78b96c05638171a78331a2f8d422b5':
  Fix recents transitions
2016-02-17 06:23:20 +00:00
Jorim Jaggi
8a5c64062f Fix recents transitions
- Also animate when there is no thumbnail, which can frequently
happen after exiting multi-window.
- Also animate when the target stack id is INVALID, because we
currently don't persist stack id's in the tasks.

Change-Id: I280c85e62f55d712408a3e77c43f665acb19bc4c
2016-02-17 06:17:48 +00:00
Wale Ogunwale
b6fa9e82ab Merge changes from topic \'flaky-test\' into nyc-dev
am: 5a21494d6e

* commit '5a21494d6eafce44adc95e1bf2a67658fa752196':
  Fixed issue with losing window name when copying WindowManager.LayoutParams
  Added AM API to remove a stack
  Don't resume activity on start if there are activities pausing.
2016-02-16 22:37:41 +00:00
Wale Ogunwale
5a21494d6e Merge changes from topic 'flaky-test' into nyc-dev
* changes:
  Fixed issue with losing window name when copying WindowManager.LayoutParams
  Added AM API to remove a stack
  Don't resume activity on start if there are activities pausing.
2016-02-16 22:32:23 +00:00
George Mount
eb0dee95d9 Merge "Don\'t use forceVisibility for Activity Transitions." into nyc-dev
am: d6505566a9

* commit 'd6505566a9bc606e84619a7b7a801557e795f1df':
  Don't use forceVisibility for Activity Transitions.
2016-02-16 21:52:38 +00:00
George Mount
d6505566a9 Merge "Don't use forceVisibility for Activity Transitions." into nyc-dev 2016-02-16 21:37:39 +00:00
Edward Cunningham
baccf15a4a DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details.
Bug: 20294239
Change-Id: Ic770a223c23013ebab08d22dd14e7192dc8e3109
(cherry picked from commit 735a31e093)
2016-02-16 19:27:32 +00:00
Wale Ogunwale
06e8ee0c8a Added AM API to remove a stack
Use the new API when closing Pip.

Bug: 26982752
Change-Id: I074d23b5535a4534626183ab77142d3932a803f0
2016-02-16 10:09:51 -08:00
Sergey Poromov
1760fe3f95 Fix BackupTransport#getBackupQuota() javadoc.
Change-Id: Ifff3329c618dabd2e73011439a2ddce2f0eeabf6
2016-02-16 18:04:35 +01:00
Andrei Stingaceanu
355b232d79 Suspend packages - new API for retrieving the suspended status
Instead of always rebuilding the full ApplicationInfo for a
package when callers are only interested in the suspended status
add a new fast API in Packagemanager (which only checks the
suspended user setting for the requested package and returns
a boolean) and change the appropriate caller code too.

Bug: 26794775
Bug: 22776761
Change-Id: Ide8428ef734479360d5a8a75fd8e0ed8ddf2da7a
2016-02-16 14:57:29 +00:00
Jeff Sharkey
1cac868cb2 Merge "Add path cache to avoid SharedPreferences jank." into nyc-dev
am: 3104a9ffd6

* commit '3104a9ffd61ed04946a405e0fc78e3904366e35e':
  Add path cache to avoid SharedPreferences jank.
2016-02-16 01:49:28 +00:00
Jeff Sharkey
3104a9ffd6 Merge "Add path cache to avoid SharedPreferences jank." into nyc-dev 2016-02-16 01:38:05 +00:00
Jeff Sharkey
be78258e55 Add path cache to avoid SharedPreferences jank.
The old getSharedPreferences() API had a side-effect behavior that
subsequent calls wouldn't touch disk if there was a cache hit.  Now
that we're using File as the cache key, we were generating the path
every time, which resulted in touching disk.

To bring back the old behavior, let's add yet another cache!

Bug: 26979210
Change-Id: Ib8346c6f69ae25f8f164e3b7e05bc6358de38906
2016-02-15 18:36:01 -07:00
Jeff Sharkey
c0681ba3c7 Merge "Add feature versions for devices and apps." into nyc-dev
am: 9c6d9753a0

* commit '9c6d9753a0f1651c639fe8158b86a1f7ffc3f60a':
  Add feature versions for devices and apps.
2016-02-16 00:53:15 +00:00
Jeff Sharkey
9c6d9753a0 Merge "Add feature versions for devices and apps." into nyc-dev 2016-02-16 00:47:49 +00:00
Jeff Sharkey
115d2c189a Add feature versions for devices and apps.
We're starting to see more instances of device features that will
increment separately from the SDK API level, such as camera HAL,
GPU capabilities, Bluetooth, and other hardware standards.

This change adds the ability for device features to specify a
version, which is defined to be backwards compatible.  That is, apps
requesting an older version of a feature must continue working on
devices with a newer version of that same feature.

When a version is undefined, we assume the default version "0".

Bug: 27162500
Change-Id: If890bf3f3dbb715e8feb80e7059a0d65618482ea
2016-02-15 17:45:42 -07:00
Jeff Sharkey
1dd0b14f1d Explicitly chmod() for compatibility.
am: 46ed6f4bd6

* commit '46ed6f4bd6d28a1319a90eb7c58dca5c20b36670':
  Explicitly chmod() for compatibility.
2016-02-15 21:27:06 +00:00
Jeff Sharkey
46ed6f4bd6 Explicitly chmod() for compatibility.
Apps typically have a umask() that prevents the mkdir() from setting
the requested permissions.

Bug: 27116987
Change-Id: Ia14e7e31531328ab36e902a864b3d2891feec544
2016-02-15 14:16:10 -07:00
Nicolas Prévot
2da7b6ebdb Merge "Allow privileged apps to set the organization color." into nyc-dev
am: eff90bd5ff

* commit 'eff90bd5ff6bd50325149a5010183277bd76f4c6':
  Allow privileged apps to set the organization color.
2016-02-15 10:51:42 +00:00
Nicolas Prévot
eff90bd5ff Merge "Allow privileged apps to set the organization color." into nyc-dev 2016-02-15 10:47:41 +00:00
Julia Reynolds
acfdf4b6ee Merge "Show topic settings inline if user has configured topics." into nyc-dev
am: 597c6d8c5d

* commit '597c6d8c5de14340550313607d0925b8ee40fea9':
  Show topic settings inline if user has configured topics.
2016-02-12 20:40:37 +00:00
Julia Reynolds
597c6d8c5d Merge "Show topic settings inline if user has configured topics." into nyc-dev 2016-02-12 20:31:55 +00:00
Julia Reynolds
fec58c263c Show topic settings inline if user has configured topics.
Change-Id: Icf51faad61b3ae4261991691a1d679b190ea712a
2016-02-12 11:42:02 -05:00
Clara Bayarri
ecc95de0f3 Merge "Add support for current failed lock attempts and max attempts" into nyc-dev
am: 29b13190cd

* commit '29b13190cd57bd823eb803f6fca03f671a32a5fe':
  Add support for current failed lock attempts and max attempts
2016-02-12 14:00:41 +00:00
Clara Bayarri
29b13190cd Merge "Add support for current failed lock attempts and max attempts" into nyc-dev 2016-02-12 13:54:10 +00:00
Clara Bayarri
51e41ad887 Add support for current failed lock attempts and max attempts
This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.

Bug: 26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
2016-02-12 13:50:43 +00:00