OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Thu, 23 Jun 2016 00:40:01 +0000 (00:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Change approach for windowPositionLostRT" into nyc-dev
John Reck [Wed, 22 Jun 2016 23:38:23 +0000 (23:38 +0000)]
Merge "Change approach for windowPositionLostRT" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 22 Jun 2016 23:33:07 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29322470
Change-Id: Iec697120d3e8b234bde18e0e37f02ad532796816

8 years agoChange approach for windowPositionLostRT
John Reck [Wed, 22 Jun 2016 21:23:31 +0000 (14:23 -0700)]
Change approach for windowPositionLostRT

Bug: 29547000

Instead of shifting the window off screen fall
back to the UI-thread calculated values. This fixes
a race issue around tear-down where we stop
drawing long before our window is actually no longer
visible, as well as fixes a funky issue with
PRESERVE_GEOMETRY during first draw.

Change-Id: I792d1966f5aaee1e703295ae79166c723b97a1dc

8 years agoMerge "Fix adb backup/restore" into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 22:56:34 +0000 (22:56 +0000)]
Merge "Fix adb backup/restore" into nyc-dev

8 years agoMerge "Report all content changes to a11y services." into nyc-dev
Phil Weaver [Wed, 22 Jun 2016 22:48:49 +0000 (22:48 +0000)]
Merge "Report all content changes to a11y services." into nyc-dev

8 years agoMerge "Use granted userId to look up provider info" into nyc-dev
Fyodor Kupolov [Wed, 22 Jun 2016 22:28:37 +0000 (22:28 +0000)]
Merge "Use granted userId to look up provider info" into nyc-dev

8 years agoMerge "Fix build due to missing abstract method impl" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 22:20:54 +0000 (22:20 +0000)]
Merge "Fix build due to missing abstract method impl" into nyc-dev

8 years agoFix adb backup/restore
Christopher Tate [Fri, 17 Jun 2016 20:24:02 +0000 (13:24 -0700)]
Fix adb backup/restore

* Exclude key/value-only backup participants until we have a chance to
  augment the archive format with proper handling.

* Don't back up 'stopped' apps, which would un-stop them

* Fix unspecified-user bindService/startActivity invocations

* Teach adb restore about the onRestoreFinished() lifecycle method

* Implement proper app timeout handling in the adb data flows

* Backstop wallpaper backup against rare leftover-state issues

Bug 28056941

Change-Id: Ia59c71a2c74a632a2c2a527b9b7374229c440d46

8 years agoMerge "Fixed whitelistManager assignment." into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 20:40:19 +0000 (20:40 +0000)]
Merge "Fixed whitelistManager assignment." into nyc-dev

8 years agoFix build due to missing abstract method impl
Adam Lesinski [Wed, 22 Jun 2016 20:11:40 +0000 (13:11 -0700)]
Fix build due to missing abstract method impl

getDisplay() was added to Context, which needs to be implemented
for BridgeContext.

Bug:28388969
Change-Id: I7b0ffcbbe252403e35f08d3fa40d6b0e4dbf0daa

8 years agoMerge "Avoid runtime restart when storage is missing." into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 20:08:17 +0000 (20:08 +0000)]
Merge "Avoid runtime restart when storage is missing." into nyc-dev

8 years agoMerge "Added more logs to track WakeLock usages" into nyc-dev
Lifu Tang [Wed, 22 Jun 2016 19:50:47 +0000 (19:50 +0000)]
Merge "Added more logs to track WakeLock usages" into nyc-dev

8 years agoReport all content changes to a11y services.
Phil Weaver [Mon, 20 Jun 2016 18:54:59 +0000 (11:54 -0700)]
Report all content changes to a11y services.

Changes were discarded if they arrived too quickly in
A11yManagerService. Excuse content change events from
throttling at this level.

Bug: 29355115
Change-Id: Ifd9da07315ce0c18f59c1dad6a621110ad48343b

8 years agoMerge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 19:11:34 +0000 (19:11 +0000)]
Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev

8 years agoMerge \\"Move conceptual test info into \\"Getting Started with Testing\\" and move...
Scott Main [Wed, 22 Jun 2016 18:49:25 +0000 (18:49 +0000)]
Merge \\"Move conceptual test info into \\"Getting Started with Testing\\" and move the procedural information into the corresponding guides for creating unit tests.\\" into mnc-io-docs am: 8af7a89820
am: 359b8cd443

Change-Id: I91ac419c6c7778b0e357719e1822fe1f6adfe0c3

8 years agoMerge \"Move conceptual test info into \"Getting Started with Testing\" and move...
smain@google.com [Wed, 22 Jun 2016 18:42:27 +0000 (18:42 +0000)]
Merge \"Move conceptual test info into \"Getting Started with Testing\" and move the procedural information into the corresponding guides for creating unit tests.\" into mnc-io-docs
am: 8af7a89820

Change-Id: I7d153a79fa01b2b35540e3fe1e965a99201110f0

8 years agoMerge "Move conceptual test info into "Getting Started with Testing" and move the...
Scott Main [Wed, 22 Jun 2016 18:37:10 +0000 (18:37 +0000)]
Merge "Move conceptual test info into "Getting Started with Testing" and move the procedural information into the corresponding guides for creating unit tests." into mnc-io-docs

8 years agoAvoid runtime restart when storage is missing.
Jeff Sharkey [Wed, 22 Jun 2016 16:35:29 +0000 (10:35 -0600)]
Avoid runtime restart when storage is missing.

When primary shared storage is completely missing, catch the thrown
exception and treat as if ejected.

Bug: 29461637
Change-Id: I8eb5cdeb01983efbf26da3d32ab19a6630662156

8 years agoMerge "Start primary storage move outside lock." into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 18:36:06 +0000 (18:36 +0000)]
Merge "Start primary storage move outside lock." into nyc-dev

8 years agoMove conceptual test info into "Getting Started with Testing" and
smain@google.com [Tue, 14 Jun 2016 18:37:19 +0000 (11:37 -0700)]
Move conceptual test info into "Getting Started with Testing" and
move the procedural information into the corresponding guides for creating
unit tests.

This is part of a cleanup for the Android Studio test docs, simplifying the
amount of content covered with Android Studio to be strictly how to create
and run tests. Bug: 28470079
Related: https://critique.corp.google.com/#review/125115510

Change-Id: I8b9590045b42a03c618e7011e0c3741aede77cd8

8 years agoFixed whitelistManager assignment.
Felipe Leme [Tue, 21 Jun 2016 22:33:43 +0000 (15:33 -0700)]
Fixed whitelistManager assignment.

It must be set before looping through all app services...

Fixes: 29480440

Change-Id: I38f78255ea44f00ea4226010d334b94fb4baadb4

8 years agoAdded more logs to track WakeLock usages
Lifu Tang [Wed, 22 Jun 2016 17:57:55 +0000 (10:57 -0700)]
Added more logs to track WakeLock usages

Bug: 28829595
Change-Id: I607745a27e830e42300ee307412e57c2254bff55

8 years agoMerge "Prevent early boot crash reading PowerProfile" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 17:31:34 +0000 (17:31 +0000)]
Merge "Prevent early boot crash reading PowerProfile" into nyc-dev

8 years agoUse granted userId to look up provider info
Fyodor Kupolov [Mon, 20 Jun 2016 21:03:44 +0000 (14:03 -0700)]
Use granted userId to look up provider info

In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.

Bug: 29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7

8 years agoPrevent early boot crash reading PowerProfile
Adam Lesinski [Wed, 22 Jun 2016 17:28:47 +0000 (10:28 -0700)]
Prevent early boot crash reading PowerProfile

The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.

Bug:29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d

8 years agoadd direct path to sdk manager docs for studio UI help button
smain@google.com [Wed, 22 Jun 2016 17:28:02 +0000 (10:28 -0700)]
add direct path to sdk manager docs for studio UI help button
bug: 28982864

Change-Id: I4186de00d0a80e54066dd209d55ecf1348a30337

8 years agoMerge "add redirect for old link to publishing docs" into nyc-dev
Scott Main [Wed, 22 Jun 2016 17:22:42 +0000 (17:22 +0000)]
Merge "add redirect for old link to publishing docs" into nyc-dev

8 years agoMerge "Unblock 'am start -W' if activity is brought to front without launching" into...
Chong Zhang [Wed, 22 Jun 2016 17:17:47 +0000 (17:17 +0000)]
Merge "Unblock 'am start -W' if activity is brought to front without launching" into nyc-dev

8 years agoMerge "Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag....
Dianne Hackborn [Wed, 22 Jun 2016 17:12:07 +0000 (17:12 +0000)]
Merge "Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag..." into nyc-dev

8 years agoMerge "Don't show the shade background for heads up notifications" into nyc-dev
Mady Mellor [Wed, 22 Jun 2016 16:49:40 +0000 (16:49 +0000)]
Merge "Don't show the shade background for heads up notifications" into nyc-dev

8 years agoMerge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 16:47:30 +0000 (16:47 +0000)]
Merge "QS Tiles: Fix some problems with connecting through intent" into nyc-dev

8 years agoMerge "Update prebuilts from build server" into nyc-dev
Todd Kennedy [Wed, 22 Jun 2016 16:46:02 +0000 (16:46 +0000)]
Merge "Update prebuilts from build server" into nyc-dev

8 years agoUpdate prebuilts from build server
Todd Kennedy [Mon, 20 Jun 2016 22:34:57 +0000 (15:34 -0700)]
Update prebuilts from build server

CtsShim.apk
versionCode='24' versionName='7.0-2996264'

CtsShimPriv.apk
versionCode='24' versionName='7.0-2996264'

Built here:
https://android-build.googleplex.com/builds/submitted/2996264/CtsShim/latest

This build is suitable for public release.

Bug: 29122339
Change-Id: I6533e3a3ed72de6d3887039e3e8cf527947c4166

8 years agoDon't iterate over a list items are removed from.
Julia Reynolds [Tue, 21 Jun 2016 11:47:22 +0000 (07:47 -0400)]
Don't iterate over a list items are removed from.

Change-Id: I896cd4578da15e21d422ca8db42e34bbd10912e8
Fixes: 29512540

8 years agoStart primary storage move outside lock.
Jeff Sharkey [Wed, 22 Jun 2016 15:04:33 +0000 (09:04 -0600)]
Start primary storage move outside lock.

Otherwise there is a potential deadlock when an unsolicited event
arrives from vold while we're still waiting for the move operation
to be processed.

The safe fix here is to kick off the move after dropping the lock.

Bug: 29501052
Change-Id: I2160c6a7a19c1d9981c692a2be2b04019352db2e

8 years agoMerge "QS: Fix default icon handling for services" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 15:39:29 +0000 (15:39 +0000)]
Merge "QS: Fix default icon handling for services" into nyc-dev

8 years agoMerge "Blacklist ATV Remote Service to never appear on Recents" into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 15:36:09 +0000 (15:36 +0000)]
Merge "Blacklist ATV Remote Service to never appear on Recents" into nyc-dev

8 years agoQS Tiles: Fix some problems with connecting through intent
Jason Monk [Tue, 21 Jun 2016 22:23:13 +0000 (18:23 -0400)]
QS Tiles: Fix some problems with connecting through intent

 - Don't send Tile through intent, it can cause crashes
 - Clean up other issues surrounding this

Change-Id: I08c626cf39b36d349592c1e0b81627b9bc7eeeb3
Fixes: 29519485

8 years agoQS: Fix default icon handling for services
Jason Monk [Wed, 22 Jun 2016 13:58:46 +0000 (09:58 -0400)]
QS: Fix default icon handling for services

Change-Id: I3b25df8b8d02cd99a943571de14cf0a8c5b051bd
Fixes: 29452288

8 years agoMerge "Restrict hotspot qs tile to admin user" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:23:25 +0000 (13:23 +0000)]
Merge "Restrict hotspot qs tile to admin user" into nyc-dev

8 years agoMerge "QS Edit: Try to simplify drag logic" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:23:16 +0000 (13:23 +0000)]
Merge "QS Edit: Try to simplify drag logic" into nyc-dev

8 years agoMerge "Don't allow showing an activity if user is stopping or shutting down." into...
Nicolas Prévot [Wed, 22 Jun 2016 12:27:12 +0000 (12:27 +0000)]
Merge "Don't allow showing an activity if user is stopping or shutting down." into nyc-dev

8 years agoDon't allow showing an activity if user is stopping or shutting down.
Nicolas Prevot [Mon, 20 Jun 2016 16:25:12 +0000 (17:25 +0100)]
Don't allow showing an activity if user is stopping or shutting down.

BUG:29264996
Change-Id: I9fc97c5dc37e6d5656b82b277954b5963eb345c4

8 years agoFix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
Dianne Hackborn [Wed, 22 Jun 2016 03:39:02 +0000 (20:39 -0700)]
Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...

...isn't respected if previous job was scheduled with same URI

Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139

8 years agoUnblock 'am start -W' if activity is brought to front without launching
Chong Zhang [Tue, 21 Jun 2016 23:31:37 +0000 (16:31 -0700)]
Unblock 'am start -W' if activity is brought to front without launching

If -W is used to start an activity successfully, but this activity just
brings another activity to front without actual launching, the waiting
will be stuck because neither activity will report launch complete.

In this case, we have to treat it as if the -W started an activity and
received return code START_TASK_TO_FRONT. It needs to wait for the new
activity to become visible (or report launch complete if it's already
visible).

This reverts earlier commits afb776d5447e19565c9a826a554911decb9ed92a,
since it's causing problems with launch time reporting.

bug: 28333487
bug: 29451567
Change-Id: I9fd79ab5b3ed8f9de5df34ed9c7b0be3a94620b2

8 years agoMerge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 01:13:55 +0000 (01:13 +0000)]
Merge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev

8 years agoMerge "Fix JAVA doc for AudioRecord and AudioTrack Builder" into nyc-dev
Eric Laurent [Wed, 22 Jun 2016 01:08:44 +0000 (01:08 +0000)]
Merge "Fix JAVA doc for AudioRecord and AudioTrack Builder" into nyc-dev

8 years agoContextImpl: Keep DisplayAdjustments and Display in sync
Adam Lesinski [Fri, 17 Jun 2016 01:05:41 +0000 (18:05 -0700)]
ContextImpl: Keep DisplayAdjustments and Display in sync

Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.

Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3

8 years agoMerge "Doc change: remove common images from localized directories." into nyc-dev
Dirk Dougherty [Wed, 22 Jun 2016 00:38:25 +0000 (00:38 +0000)]
Merge "Doc change: remove common images from localized directories." into nyc-dev

8 years agoMerge "Notification: Respect disabled HUNs on updates" into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 00:35:28 +0000 (00:35 +0000)]
Merge "Notification: Respect disabled HUNs on updates" into nyc-dev

8 years agoMerge "Fix stale transformations" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 23:25:14 +0000 (23:25 +0000)]
Merge "Fix stale transformations" into nyc-dev

8 years agoMerge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\"...
Sudheer Shanka [Tue, 21 Jun 2016 23:17:44 +0000 (23:17 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-dev am: b43fe62933  -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc  -s ours am: e01775f0be am: 5e41f90a92 am: 80e720742b
am: 565d13f17e  -s ours

Change-Id: I141d8fb97fc5aac644ef50ff07f055ec7a03823e

8 years agoMerge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into...
Sudheer Shanka [Tue, 21 Jun 2016 23:14:52 +0000 (23:14 +0000)]
Merge \\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\" into lmp-dev am: b43fe62933  -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc  -s ours am: e01775f0be am: 5e41f90a92
am: 80e720742b

Change-Id: I745cd1c7129c79daa13c90fe6bbcef43cb39dce2

8 years agoadd redirect for old link to publishing docs
smain@google.com [Tue, 21 Jun 2016 23:14:08 +0000 (16:14 -0700)]
add redirect for old link to publishing docs

Change-Id: Iabf814d79783c8dd9e815243292519e43b1bbf9e

8 years agoNotification: Respect disabled HUNs on updates
Adrian Roos [Tue, 21 Jun 2016 23:12:48 +0000 (16:12 -0700)]
Notification: Respect disabled HUNs on updates

Fixes a bug where HUNs would be posted on updates
even if HUNs had been disabled.

Fixes: 29520322
Change-Id: I3806b9c5b8835a62f7b58bd0a3bbdd55b02eb892

8 years agoMerge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into...
Sudheer Shanka [Tue, 21 Jun 2016 23:11:08 +0000 (23:11 +0000)]
Merge \\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\" into lmp-dev am: e64034a27d  -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254  -s ours am: 199f6a490a am: 06c3f60136 am: 9088be4ebe
am: 95c9bef53b  -s ours

Change-Id: I7b406c32d9231f2850651d09fc58e2dc50c38b8a

8 years agoMerge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into...
Sudheer Shanka [Tue, 21 Jun 2016 23:10:54 +0000 (23:10 +0000)]
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-dev am: b43fe62933  -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc  -s ours am: e01775f0be
am: 5e41f90a92

Change-Id: I5b9897a2a3e44faed6f101c52ab729612404c739

8 years agoMerge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into...
Sudheer Shanka [Tue, 21 Jun 2016 23:05:02 +0000 (23:05 +0000)]
Merge \\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\" into lmp-dev am: e64034a27d  -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254  -s ours am: 199f6a490a am: 06c3f60136
am: 9088be4ebe

Change-Id: I886553aec1438d0857cdc52413008ecaf64bae2a

8 years agoMerge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp...
Sudheer Shanka [Tue, 21 Jun 2016 22:55:40 +0000 (22:55 +0000)]
Merge \\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\" into lmp-dev am: e64034a27d  -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254  -s ours am: 199f6a490a
am: 06c3f60136

Change-Id: Ie7b8e901e3fbb46f3d7d76b1bc8ea8bc6c31eb63

8 years agoBlacklist ATV Remote Service to never appear on Recents
Sid Soundararajan [Tue, 21 Jun 2016 21:23:01 +0000 (14:23 -0700)]
Blacklist ATV Remote Service to never appear on Recents

BUG: 28764678
Change-Id: I0be5f9f408f16cfb683793a84cef7a368e5fa867

8 years agoMerge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp...
Sudheer Shanka [Tue, 21 Jun 2016 22:42:25 +0000 (22:42 +0000)]
Merge \\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\" into lmp-dev am: b43fe62933  -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc  -s ours
am: e01775f0be

Change-Id: Ia4ac90dc59c50aabd1c3de69885c1312e37d915a

8 years agoMerge \\\\"Add pm operation to set user restrictions.\\\\" into mnc-dev am: 144b3a42c...
Sudheer Shanka [Tue, 21 Jun 2016 22:42:23 +0000 (22:42 +0000)]
Merge \\\\"Add pm operation to set user restrictions.\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35
am: 4e8aa0f35f  -s ours

Change-Id: Id82e4921ebc46dcf802acad895410ed79026d9ce

8 years agoMerge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp...
Sudheer Shanka [Tue, 21 Jun 2016 22:42:23 +0000 (22:42 +0000)]
Merge \\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\" into lmp-dev am: e64034a27d  -s ours am: db7e70c2f0 am: e0cc5e20ae am: 0d457d1254  -s ours
am: 199f6a490a

Change-Id: Ia9f6d50c60621431781986062491e7c3fbf92f94

8 years agoMerge \\\\"Reduce shell power over user management.\\\\" into mnc-dev am: 964500fd43...
Sudheer Shanka [Tue, 21 Jun 2016 22:38:39 +0000 (22:38 +0000)]
Merge \\\\"Reduce shell power over user management.\\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f am: fb87ae59b0
am: 63e8198685  -s ours

Change-Id: Id8035a1dde1a4ec04779e68ae14df5d2d4e2530f

8 years agoMerge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp...
Sudheer Shanka [Tue, 21 Jun 2016 22:36:46 +0000 (22:36 +0000)]
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-dev am: b43fe62933  -s ours am: 96676a2d41 am: a9b937b29d
am: 47da8a0bdc  -s ours

Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438

8 years agoMerge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-dev...
Sudheer Shanka [Tue, 21 Jun 2016 22:36:43 +0000 (22:36 +0000)]
Merge \\\\"DO NOT MERGE: Reduce shell power over user management.\\\\" into lmp-dev am: e64034a27d  -s ours am: db7e70c2f0 am: e0cc5e20ae
am: 0d457d1254  -s ours

Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78

8 years agoMerge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev...
Sudheer Shanka [Tue, 21 Jun 2016 22:31:11 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am: b43fe62933  -s ours am: 96676a2d41
am: a9b937b29d

Change-Id: Ib0923227e223a7b3a94e4d443e6e5c308977e65b

8 years agoMerge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev...
Sudheer Shanka [Tue, 21 Jun 2016 22:31:09 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev am: e64034a27d  -s ours am: db7e70c2f0
am: e0cc5e20ae

Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6

8 years agoMerge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev...
Sudheer Shanka [Tue, 21 Jun 2016 22:25:34 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am: b43fe62933  -s ours
am: 96676a2d41

Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1

8 years agoMerge \\\"Add pm operation to set user restrictions.\\\" into mnc-dev am: 144b3a42cc...
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\\"Add pm operation to set user restrictions.\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837
am: 916728bb35

Change-Id: Id7990003b3a5a6db9f9d16eb57ec37d47505165a

8 years agoMerge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am...
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am: e64034a27d  -s ours
am: db7e70c2f0

Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0

8 years agoMerge \\\"Reduce shell power over user management.\\\" into mnc-dev am: 964500fd43...
Sudheer Shanka [Tue, 21 Jun 2016 22:25:19 +0000 (22:25 +0000)]
Merge \\\"Reduce shell power over user management.\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f
am: fb87ae59b0

Change-Id: I4e517e522896242fb9b23b21c217c6fd876ef8b7

8 years agoMerge "Do animations correctly in systemUI" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 22:20:43 +0000 (22:20 +0000)]
Merge "Do animations correctly in systemUI" into nyc-dev

8 years agoMerge \\"Add pm operation to set user restrictions.\\" into mnc-dev am: 144b3a42cc
Sudheer Shanka [Tue, 21 Jun 2016 22:19:09 +0000 (22:19 +0000)]
Merge \\"Add pm operation to set user restrictions.\\" into mnc-dev am: 144b3a42cc
am: f43aa2e837

Change-Id: Ic6c3cf2871105e5f81bbd30ee30311b5d5a535a6

8 years agoMerge \\"Reduce shell power over user management.\\" into mnc-dev am: 964500fd43
Sudheer Shanka [Tue, 21 Jun 2016 22:19:05 +0000 (22:19 +0000)]
Merge \\"Reduce shell power over user management.\\" into mnc-dev am: 964500fd43
am: 9bfa0ad22f

Change-Id: I952f6a12be0c1edc6027ccce785d47d7f84757ef

8 years agoRevert "Parse "vendor/priv-app" to find privileged applications"
Todd Kennedy [Tue, 21 Jun 2016 22:14:55 +0000 (22:14 +0000)]
Revert "Parse "vendor/priv-app" to find privileged applications"

This reverts commit 02708b1ac41e12029b806085f8ff76a0e2c916b5.

Change-Id: Ie1ba362a9f5ee46516a79c35bd4a6e45f84b6a32

8 years agoFix JAVA doc for AudioRecord and AudioTrack Builder
Eric Laurent [Tue, 21 Jun 2016 19:56:41 +0000 (12:56 -0700)]
Fix JAVA doc for AudioRecord and AudioTrack Builder

The default sampling rate chosen for an AudioTrack or AudioRecord
constructed with a Builder not specifying a sampling rate is not
the primary output sampling rate but depends on the device actually
selected.

Bug: 29541155
Change-Id: Ifcab65418b816b7321b6e9542b9e4bb95f748f95

8 years agoMerge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:12:17 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am: b43fe62933  -s ours

Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5

8 years agoMerge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:12:15 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
am: e64034a27d  -s ours

Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1

8 years agoMerge \"Add pm operation to set user restrictions.\" into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:11:47 +0000 (22:11 +0000)]
Merge \"Add pm operation to set user restrictions.\" into mnc-dev
am: 144b3a42cc

Change-Id: I1de4650ef53751654145a3ad1c40390711414341

8 years agoMerge \"Reduce shell power over user management.\" into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:11:44 +0000 (22:11 +0000)]
Merge \"Reduce shell power over user management.\" into mnc-dev
am: 964500fd43

Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9

8 years agoMerge \\"docs: Noted that orderId is blank for all test purchases.\\" into mnc-io...
Kevin Hufnagle [Tue, 21 Jun 2016 22:04:45 +0000 (22:04 +0000)]
Merge \\"docs: Noted that orderId is blank for all test purchases.\\" into mnc-io-docs am: b47e5dc798
am: 1b0751e097

Change-Id: Ib7fd5bb44a40b721b7893ff3bdd51bbf0e9a278b

8 years agoMerge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:14 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev

8 years agoMerge "Add pm operation to set user restrictions." into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:09 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into mnc-dev

8 years agoMerge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:08 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev

8 years agoMerge "Reduce shell power over user management." into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:04 +0000 (22:03 +0000)]
Merge "Reduce shell power over user management." into mnc-dev

8 years agoMerge \"docs: Noted that orderId is blank for all test purchases.\" into mnc-io-docs
Kevin Hufnagle [Tue, 21 Jun 2016 21:58:30 +0000 (21:58 +0000)]
Merge \"docs: Noted that orderId is blank for all test purchases.\" into mnc-io-docs
am: b47e5dc798

Change-Id: I3aece10845f33bf2867f2450a9657e9d55152ba1

8 years agoMerge "docs: Noted that orderId is blank for all test purchases." into mnc-io-docs
Kevin Hufnagle [Tue, 21 Jun 2016 21:53:50 +0000 (21:53 +0000)]
Merge "docs: Noted that orderId is blank for all test purchases." into mnc-io-docs

8 years agoMerge "Prevent startNavigating() call when GPS is off" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 21:47:25 +0000 (21:47 +0000)]
Merge "Prevent startNavigating() call when GPS is off" into nyc-dev

8 years agoMerge "registerUpdatedByApp should be synchronized" into nyc-dev
Chris Wren [Tue, 21 Jun 2016 21:46:33 +0000 (21:46 +0000)]
Merge "registerUpdatedByApp should be synchronized" into nyc-dev

8 years agoDO NOT MERGE: Add pm operation to set user restrictions.
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.

Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df

8 years agoMerge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 21:23:57 +0000 (21:23 +0000)]
Merge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev

8 years agoMerge "Tweaks to DragAndDropPermissions behavior" into nyc-dev
Yorke Lee [Tue, 21 Jun 2016 21:10:52 +0000 (21:10 +0000)]
Merge "Tweaks to DragAndDropPermissions behavior" into nyc-dev

8 years agoDo animations correctly in systemUI
Selim Cinek [Tue, 21 Jun 2016 20:05:09 +0000 (13:05 -0700)]
Do animations correctly in systemUI

When properties weren't changing, animators were not cancelled.
In addition did we still apply the delay even though animators
were running before.

Change-Id: I05fdd15d770900ac901eb95b616bed4cf311cd23
Fixes: 29540362

8 years agoDoc change: remove common images from localized directories.
Dirk Dougherty [Tue, 21 Jun 2016 20:49:54 +0000 (13:49 -0700)]
Doc change: remove common images from localized directories.

Change-Id: Ia06a34ae09b9f6bdd855cbb579ee6d97cd9863a4

8 years agoMerge "Fixed notificaiton Stress Test" into nyc-dev
Bennie Ouyang [Tue, 21 Jun 2016 20:42:01 +0000 (20:42 +0000)]
Merge "Fixed notificaiton Stress Test" into nyc-dev

8 years agoTweaks to DragAndDropPermissions behavior
Yorke Lee [Mon, 20 Jun 2016 22:41:35 +0000 (15:41 -0700)]
Tweaks to DragAndDropPermissions behavior

No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.

Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.

Bug: 29162822

Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896

8 years agoMerge "Always report window move to client" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:55:54 +0000 (19:55 +0000)]
Merge "Always report window move to client" into nyc-dev

8 years agoMerge "Add getApplicationConfigForPackage" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:51:19 +0000 (19:51 +0000)]
Merge "Add getApplicationConfigForPackage" into nyc-dev