Commit Graph

4723 Commits

Author SHA1 Message Date
Dianne Hackborn
221b545cda Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 2014-12-02 19:22:07 +00:00
Dianne Hackborn
a01a0faebf Fix issue #18510117: Returning from an activity started with...
...startActivityForResult causes SecurityExpcetion

The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.

Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa
2014-12-02 10:33:14 -08:00
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
2014-12-02 11:21:13 +00:00
Alan Viverette
d26276d9e3 Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
BUG: 18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
2014-11-26 16:08:58 -08:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data.
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
2014-11-25 20:48:41 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
e935fe918e Fix MediaStyle API comments
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
2014-11-24 14:18:06 +01:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
2014-11-21 13:57:48 -08:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
2014-11-21 21:35:08 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
f8f56bce42 Fix DPM.resetPassword("")
While we're at it, also fix some multi-user issues in
LockPatternUtils.

Bug: 17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
2014-11-21 13:34:06 +01:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
2014-11-21 10:13:59 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00
Jeff Brown
694c1d2b2d Merge "Support keeping activities resumed while dozing." into lmp-sprout-dev 2014-11-21 00:54:05 +00:00
Jeff Brown
fbe96706bb Support keeping activities resumed while dozing.
If the lock screen is not shown, then let activities keep running
while dozing.  This is important to support ambient mode on watches
since it allows the home app to keep running.

To make this possible, we need to inform the activity manager about
the exact wakefulness state, not just the overall boolean
interactive state.

Bug: 18284212
Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
2014-11-20 16:49:18 -08:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
2014-11-20 21:48:38 +01:00
Christopher Tate
ac6a3a5e9d Recents backup helper
Handles backup/restore of recent tasks for the system.  Currently the
thumbnails are not saved.

At restore time the historical task records are placed in a designated
separate location rather than directly in the live bookkeeping; this
avoids ID duplication issues and makes it easier to deal with lazy
adoption of the historical task state as apps are installed on the
device post-restore.

Bug 17303286
Bug 15986349

Change-Id: Ie156c1e2ab9c9a7e7ac0447b27016fdcef55dded
2014-11-20 12:48:25 -08:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
2014-11-20 21:45:04 +01:00
Wink Saville
816e19eb6d Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:31:49 +00:00
Wink Saville
2d1ee98227 Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit baf21da1e1.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
2014-11-20 20:29:51 +00:00
Wink Saville
4a57e90817 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:20:02 +00:00
Adam Lesinski
825e0da22a Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 2014-11-20 20:13:54 +00:00
Adam Lesinski
23d40c40aa Fix race when cleaning up receivers/services in Context
Bug:18135575
Change-Id: I2c69c8189d9ebd297c8a83fe84658b26cbb0528f
2014-11-20 12:00:52 -08:00
Dianne Hackborn
d9968438bc Merge "Fix issue with call backs from media process." into lmp-mr1-dev 2014-11-20 18:29:15 +00:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
2014-11-19 16:03:09 -08:00
Chet Haase
85603a7faf Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 2014-11-20 00:02:09 +00:00
Chet Haase
0d1c27a713 Fix seeking and scaled duration behavior
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
2014-11-19 15:29:47 -08:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process.
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
2014-11-19 14:29:10 -08:00
Filip Gruszczynski
6eafa902cb SwipeDismissLayout makes activity opaque only after entry animation ends.
Bug: 18340863
Change-Id: Ic60fa2463618f86b1ae23fc4a0c06cd348f28334
2014-11-19 11:05:43 -08:00
Rubin Xu
735f22850e Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 2014-11-18 23:43:17 +00:00
Sander Alewijnse
0925db8715 Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev 2014-11-18 19:28:17 +00:00
Rubin Xu
a97855b784 Remove permission check in DevicePolicyManager.isUninstallBlocked()
This is to allow Play to use this API to find out whether a package
is uninstallable due to profile or device owner policy's restriction.

Bug: 17914630
Change-Id: I4ce2963884ecdf3306805f36db80ed1ebf04d88f
2014-11-18 17:53:46 +00:00
Sander Alewijnse
5a1442589f Rename the dont_disable_system_apps constant.
Bug:18414080
Change-Id: Ief9c6ac4346ab0588514f89a659fcb09d10d6574
2014-11-18 13:25:04 +00:00
Griff Hazen
9c5be4eddd Improve doc for {get,set}HintAvoidBackgroundClipping
Bug: 18414403
Change-Id: I4cc069ca8f13d7521aa94e3c18f776de69280e2f
2014-11-17 17:47:50 -08:00
Jeff Brown
bba231d7a6 Explicitly bind AsyncTask to main looper.
It seems we were sort of trying to do this by forcing the AsyncTask
static initializer to run at certain times but it was not sufficiently
reliable.  In particular, this resulted in occasional system
server crashes.

Bug: 18192406
Change-Id: Ief73210c60e7680fbed6df74e3e58809b7ec7e4d
2014-11-14 17:22:31 -08:00
Sander Alewijnse
f39cec0b06 Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 2014-11-14 10:26:38 +00:00
Sander Alewijnse
8c41156178 Add extra to enable device admins to skip removal of system apps.
Bug:17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
2014-11-13 18:16:28 +00:00
Alexandra Gherghina
6e33f0fbb5 Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev 2014-11-13 13:59:35 +00:00
Alexandra Gherghina
aaf2f3e895 Add extra for account migration in the DevicePolicyMamager
This is in preparation for the implementation CL

Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
2014-11-13 12:46:16 +00:00
Zoltan Szatmary-Ban
201caf57f9 Adding method to query backup manager service activity status
Bug: 17367491
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
2014-11-12 23:51:31 +00:00
Dianne Hackborn
fabb70b2ef Add reporting of Parcel memory/count.
Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
2014-11-12 21:56:30 +00:00
Amith Yamasani
52c39a16db Allow profile owners to set the unknown source setting
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
2014-11-11 23:38:24 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information.
This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want.  However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information.  It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists.  The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras.  We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme.  Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
2014-11-11 00:42:18 +00:00
George Mount
19c1cbda5a Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev 2014-11-10 23:48:34 +00:00
Pete Gast
705c9c131a Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 2014-11-10 16:35:57 +00:00