Paul Crowley
0d122e265c
am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev
...
* commit 'ba94fd5e6c243c6256a1627a41aaab52a74747d6':
Add flag for wiping factory reset protection data.
2014-11-26 12:02:37 +00: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
9a4d0257be
am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
...
* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
Fix DPM.resetPassword("")
2014-11-25 15:09:24 +00:00
Christoph Studer
fe6d4f094d
am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev
...
* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
Fix MediaStyle API comments
2014-11-25 15:09:18 +00:00
Wink Saville
b4c5410987
am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:06:09 +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
1f26bf6bfd
am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev
...
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
Different messages when wiping user and not device
2014-11-21 23:07:03 +00: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
Jeff Brown
4c9041cf83
am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev
...
* commit '1ac13e0212a770c918d32e6c645682466113632c':
Support keeping activities resumed while dozing.
2014-11-21 21:59:47 +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
99d983b086
am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev
...
automerge: b3e8ff0
2014-11-21 15:26:51 +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
5a429758e9
am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37
...
* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
SwipeDismissLayout makes activity opaque only after entry animation ends.
2014-11-21 10:26:31 +00:00
Filip Gruszczynski
a83c5806de
Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
...
automerge: 96c5d37
2014-11-21 10:13:59 +00:00
Christopher Tate
5b0528b5e1
am b2b8dcba: am ad064d48: Merge "Recents backup helper" into lmp-mr1-dev
...
* commit 'b2b8dcba2c623f52ebe166ad68bff5f6a34bf25a':
Recents backup helper
2014-11-21 03:09:06 +00:00
Adrian Roos
2a5663d524
am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev
...
automerge: 62a7d53
2014-11-21 02:47:16 +00:00
Adrian Roos
cf047b5d55
am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev
...
automerge: 866bae5
2014-11-21 02:46:16 +00:00
Wink Saville
49414b5b21
am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
...
automerge: 1caab41
2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a
am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
automerge: 68c21d6
2014-11-21 02:39:23 +00:00
Adam Lesinski
36671b925c
am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev
...
automerge: b7ce6d6
2014-11-21 02:36:57 +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
Dianne Hackborn
377d6f00dc
am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev
...
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
Fix issue with call backs from media process.
2014-11-21 00:43:51 +00: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
Chet Haase
a2b3a75ca5
am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev
...
automerge: a79d2e8
2014-11-20 21:13:10 +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
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
3c1d5e2f9d
am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
...
* commit '40603baa3ec570b1cb423e3488125b1dd35cb5e9':
Remove permission check in DevicePolicyManager.isUninstallBlocked()
2014-11-19 00:19:50 +00: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
476e3c3904
am 0af82f65: am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev
...
* commit '0af82f65d311787688a8bb634a47f24dec3138ab':
Rename the dont_disable_system_apps constant.
2014-11-18 19:35:24 +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
