Commit Graph

6422 Commits

Author SHA1 Message Date
Todd Kennedy
47c8244e4e Merge "Override package storage constraint" 2015-08-12 16:53:32 +00:00
Alan Viverette
73a9dfc22c am 4304d9ac: am b2087fa8: am f3d04cbf: am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
* commit '4304d9ac967b73cc79da7a6b7352a74b67afe6f1':
  Don't re-wrap alert dialog context
2015-08-11 20:08:20 +00:00
Alan Viverette
4304d9ac96 am b2087fa8: am f3d04cbf: am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
* commit 'b2087fa81ccbf4214de31b324ff0106f2363d02d':
  Don't re-wrap alert dialog context
2015-08-11 20:02:36 +00:00
Alan Viverette
f3d04cbfe6 am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
* commit 'bb03bf055437c21180026b8c8227c52ca2809286':
  Don't re-wrap alert dialog context
2015-08-11 19:48:00 +00:00
Alan Viverette
105febd2cf Merge "Don't re-wrap alert dialog context" into mnc-dev 2015-08-11 19:34:27 +00:00
Alan Viverette
93d9e26ffb Don't re-wrap alert dialog context
Bug: 23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
2015-08-11 15:02:42 -04:00
Alan Viverette
7bea76cecf am 3e384531: am 1743988c: am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit '3e384531bed8f80867ce1bab9c8de315865be824':
  Avoid use-after-free race condition when rebasing theme
2015-08-11 18:59:42 +00:00
Alan Viverette
3e384531be am 1743988c: am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit '1743988cd7647af8c64c961d4ca5e9d4b4b7bc00':
  Avoid use-after-free race condition when rebasing theme
2015-08-11 18:53:13 +00:00
Alan Viverette
6c3a468cf3 am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit 'e720297fd89d39325a34f0d8f54e55971aec7269':
  Avoid use-after-free race condition when rebasing theme
2015-08-11 18:38:21 +00:00
Alan Viverette
b4eb06402f Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 2015-08-11 18:24:04 +00:00
Alan Viverette
c12ec70def Avoid use-after-free race condition when rebasing theme
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.

Bug: 22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
2015-08-11 10:26:08 -04:00
Esteban Talavera
12c49da344 am 6f4de128: am 84bd2172: am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev
* commit '6f4de12870f02f44ef02efef04dc09affe58d187':
  Update setApplicationRestrictions documentation
2015-08-11 10:38:58 +00:00
Esteban Talavera
6f4de12870 am 84bd2172: am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev
* commit '84bd2172ea42dc6681bcf4f96e19a3f5fd928b41':
  Update setApplicationRestrictions documentation
2015-08-11 10:30:33 +00:00
Esteban Talavera
8e85fdfe46 am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev
* commit '467951eebbc6525b40a6b569c401849fe2394c1d':
  Update setApplicationRestrictions documentation
2015-08-11 10:16:36 +00:00
Esteban Talavera
4dbb37ae95 Merge "Update setApplicationRestrictions documentation" into mnc-dev 2015-08-11 09:40:57 +00:00
Filip Gruszczynski
2349332f9f Only relaunch activity on significant size configuration changes.
Currently if the configuration width/height/smallest width changes, we
relaunch the activity or invoke onConfigurationChanged callback. When it
comes to size based configuration changes it might not be necessary: if
the size change doesn't pass one of the threshold defined by the
resources, it means there is no need to relaunch the activity.

In this CL the ActivityManager will receive the thresholds from the
application and use them to decide, whether to relaunch the activity.
The application reads the thresholds from the resources, specifically
from resource qualifiers used by the app.

Change-Id: Ie3cf0a172dc1ba0b865cf30c2962e7cfd9ad8436
2015-08-10 13:47:31 -07:00
Esteban Talavera
6b8e06495b Update setApplicationRestrictions documentation
From M we support nested Bundles in the input parameter

Bug: 23076454
Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
2015-08-10 18:04:10 +01:00
Todd Kennedy
f39ca8f5e5 Override package storage constraint
We want to be able to move arbitrary packages to external storage,
regardless what they specify in their manifest. This is a developer
option and should be used with care. Trouble may ensue if an
application is moved when it really doesn't want to be moved

Bug: 22282121
Change-Id: I7664816a7fd122e6cdf3070fe50ce5464f325380
2015-08-10 09:50:48 -07:00
Dianne Hackborn
908109c1f9 am 0385e3e9: am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev
* commit '0385e3e908fb9988bb2d2d0d15e32cb6a819b34e':
  Fix issue #22989030: Separate battery whitelists
2015-08-08 02:49:41 +00:00
Matthew Williams
bb24672e97 am b244ed03: am b64f25ad: am 253f2c33: am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit 'b244ed03531e77f178bf9a3150b8f46c4711c78b':
  Correctly skip files that are excluded from restore
2015-08-08 02:49:30 +00:00
Dianne Hackborn
0385e3e908 am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev
* commit '8e63bbfd00ee27fcdbb04cfc0cf96ccdb2c50cc5':
  Fix issue #22989030: Separate battery whitelists
2015-08-07 22:30:17 +00:00
Dianne Hackborn
efa4dee126 am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev
* commit '977d421af9466ed6cd83630f6ba91c873f501e5b':
  Fix issue #22989030: Separate battery whitelists
2015-08-07 22:13:02 +00:00
Dianne Hackborn
f0e5501e09 Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 2015-08-07 21:58:38 +00:00
Matthew Williams
b244ed0353 am b64f25ad: am 253f2c33: am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit 'b64f25ad97a92be4dcf8844c79c218ae9c1e0af4':
  Correctly skip files that are excluded from restore
2015-08-07 21:53:21 +00:00
Matthew Williams
253f2c334e am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit '2327dd3f808c871f9e89772f06152052f6c74957':
  Correctly skip files that are excluded from restore
2015-08-07 21:37:33 +00:00
Matthew Williams
9d92955894 Merge "Correctly skip files that are excluded from restore" into mnc-dev 2015-08-07 21:25:31 +00:00
Dianne Hackborn
4a503b1ece Fix issue #22989030: Separate battery whitelists
We now have a new whitelist you can put apps in, which
opts them out of the old battery saver mode and new app idle,
but doesn't keep them from going in to doze.  This is for a few
special cases that we had previously whitelisted for battery saver,
and inherited to the new modes...  ultimately we should figure out
how to get these apps out of the whitelist completely, but this
will help for now.

Apps in this new whitelist are not shown in the UI, because they
are still significantly restricted by not being able to operate
normally in doze.  This also means they are still visible in the
list of all apps for the user to be able to put them on/off the
complete whitelist if that is what they really want.

In the course of doing this, I needed to clean up code in the
network policy manager to better separate management of the
two firewall rules that now have different whitelists applied
to them.  This also hopefully just generally simplifies and cleans
up that code.  Hopefully!

Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353
2015-08-07 14:23:32 -07:00
Stefan Kuhne
3acd69327e Merge "Adding missing WindowStackCallback to Window" 2015-08-07 20:15:48 +00:00
Dongwon Kang
de0d5d746f MediaRouter: make MediaRouteButton inherit Widget.Material.ActionButton
Also, fix onMeasure() to ensure that (min) width/height includes paddings.

Bug: 22947288
Change-Id: Iba49d89e014d0df747cbdde8383de4158700ac70
2015-08-07 18:29:23 +00:00
Stefan Kuhne
9bad7410e5 Adding missing WindowStackCallback to Window
Bug: 22984908
Change-Id: I0efe210c2e1d2efba3e3ca20e6db393a904f28b9
2015-08-07 10:59:05 -07:00
Svetoslav Ganov
598b03d100 am 9bf912c1: am 5ed03384: am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '9bf912c1cf6941402dc0f8ef449f34787796875e':
  Immediately kill a shared user process on a permission revocation.
2015-08-07 16:02:04 +00:00
Svetoslav Ganov
9bf912c1cf am 5ed03384: am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '5ed0338499b4f6cb8fd9eeedae7c89133c02d247':
  Immediately kill a shared user process on a permission revocation.
2015-08-07 15:55:55 +00:00
Svetoslav Ganov
1f51460887 am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '5a624aad5faa0a71ce6495671caac1ccd90544ba':
  Immediately kill a shared user process on a permission revocation.
2015-08-07 15:40:35 +00:00
Svetoslav Ganov
38d30dc547 Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 2015-08-07 15:27:49 +00:00
Svetoslav
aa41add33b Immediately kill a shared user process on a permission revocation.
1. When a permission is revoked we kill the app immediately but do
   not do an immediate kill for shared uid processes. This fixes it.

2. Remove system APIs that are used only by the package installer.

bug:22984670

Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183
2015-08-06 18:47:41 -07:00
Wale Ogunwale
6e02fa01a0 Merge changes I4fc1b47e,Icc6d6b25,I8c6bb864
* changes:
  Support for an activity to change and/or query it's associated stack
  Support creating/launching a task with non-fullscreen bounds
  Support finishing a task with any finishing activity in the task.
2015-08-06 17:29:28 +00:00
Matthew Williams
b9ebed56e4 Correctly skip files that are excluded from restore
BUG: 22957980
If a file was present in the backup but excluded on restore,
it can result in the restored data being corrupted.
Ensure that FullBackup.restoreFile is called with a
null destination, which will result in the file not
being written to disk, but still properly pulled
from the socket.

Change-Id: Iac882a961b76e687654535aec352678486a08c39
2015-08-06 10:28:08 -07:00
Dianne Hackborn
a1a9644529 am 74423ccf: am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '74423ccf95c9d09a52a6a6fbe8ccedb1be88eda9':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 17:24:31 +00:00
Dianne Hackborn
74423ccf95 am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit 'aacc797809e5bf2c02735cb3a7d92c5ccefb5116':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 17:19:53 +00:00
Dianne Hackborn
41dfffb357 am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit 'db6a6a215e9f55b9413e18ca9c67aa3ef31bbefb':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 17:00:47 +00:00
Wale Ogunwale
868a5e16c3 Support for an activity to change and/or query it's associated stack
Change-Id: I4fc1b47e5d6196a56a6e40f10fae97219554722c
2015-08-06 09:59:32 -07:00
Wale Ogunwale
ba7881c89e Support finishing a task with any finishing activity in the task.
Change-Id: I8c6bb864de6dc135e0fedb16ee424d7816ee3cfa
2015-08-06 09:59:32 -07:00
Dianne Hackborn
6b0f1e78b8 Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 2015-08-06 16:48:34 +00:00
Alan Treadway
f67dcd9526 am a544ea9b: am 351c3bd1: am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit 'a544ea9b97342e2cc872f9a527de5960814349ef':
  Update documentation of DevicePolicyManager intents.
2015-08-06 16:20:09 +00:00
Alan Treadway
a544ea9b97 am 351c3bd1: am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '351c3bd16b4c23d267f3dc2c00a555a82fd7e77e':
  Update documentation of DevicePolicyManager intents.
2015-08-06 16:14:42 +00:00
Alan Treadway
54f1ffcdd6 am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '2d1cf6278587224125da298aba42044aff1d5d8c':
  Update documentation of DevicePolicyManager intents.
2015-08-06 15:59:43 +00:00
Alan Treadway
190a88d2ce Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 2015-08-06 15:47:34 +00:00
Alan Treadway
4582f8113d Update documentation of DevicePolicyManager intents.
Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.

Bug: 21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
2015-08-06 16:44:52 +01:00
Dianne Hackborn
6bdd3a155f Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
Add new Activity callback to tell it when its saved state has
been invalidated.

The problem is that delivering the permission result does not go
through a path where the compatibility code can see it first to
mark its fragment manager as no longer having saved state.  So this
new callback gives it a place to do that.

Change-Id: I5a4a185d9c746bae1afb5c588aba82c8daccf079
2015-08-05 15:01:28 -07:00
Rubin Xu
82543934db am 9b5bd26e: am c0ad5751: am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit '9b5bd26ee1855e5527f448e5e26181e12320b956':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
2015-08-05 17:49:31 +00:00