OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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

8 years agoMerge "Ignore system apps on enforceMeteredApnPolicy()." into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:50:59 +0000 (19:50 +0000)]
Merge "Ignore system apps on enforceMeteredApnPolicy()." into nyc-dev

8 years agoFix stale transformations
Adrian Roos [Tue, 21 Jun 2016 18:56:57 +0000 (11:56 -0700)]
Fix stale transformations

In messaging style we sometimes transform an individual
message and sometimes we don't. This causes the ViewTransformationHelper
to sometimes add the container and sometimes the individual messages,
which prevented the right view from getting reset.

To fix this, we now reset all views that were once managed by
ViewTransformationHelper but no longer are.

Change-Id: I1512434fde5b4444657db1c69f9a7bd1ba96fe5f
Fixes: 29509682

8 years agodocs: Noted that orderId is blank for all test purchases.
Kevin Hufnagle [Mon, 20 Jun 2016 23:44:08 +0000 (16:44 -0700)]
docs: Noted that orderId is blank for all test purchases.

All test purchases associated with Google Play apps---both one-time
and subscription---now contain a blank "orderId" field. Updated the
documentation accordingly. Also removed the explanation about
canceling test purchases using the merchant center; a lack of an
"orderId" value prevents this workflow from being possible anymore.

Bug: 29068371
Change-Id: I748989c404549769eefd44afa3a7cc125f2e7073

8 years agoMerge "Reduce race when connecting to an existing content provider." into nyc-dev
Dianne Hackborn [Tue, 21 Jun 2016 19:18:36 +0000 (19:18 +0000)]
Merge "Reduce race when connecting to an existing content provider." into nyc-dev

8 years agoDO NOT MERGE: Reduce shell power over user management.
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
DO NOT MERGE: Reduce shell power over user management.

Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.

Bug: 29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3

8 years agoregisterUpdatedByApp should be synchronized
Chris Wren [Tue, 21 Jun 2016 18:38:04 +0000 (14:38 -0400)]
registerUpdatedByApp should be synchronized

Bug: 29524139
Change-Id: I226b5f32fdab6b369451d0c64310f788944495d0

8 years agoMerge "Fixed an issue where the deleteintent of children wasn't sent" into nyc-dev
Selim Cinek [Tue, 21 Jun 2016 18:07:41 +0000 (18:07 +0000)]
Merge "Fixed an issue where the deleteintent of children wasn't sent" into nyc-dev

8 years agoMerge "Allow trust agents to run during provisioning" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 18:04:05 +0000 (18:04 +0000)]
Merge "Allow trust agents to run during provisioning" into nyc-dev

8 years agoReduce race when connecting to an existing content provider.
Dianne Hackborn [Mon, 20 Jun 2016 22:20:15 +0000 (15:20 -0700)]
Reduce race when connecting to an existing content provider.

We lost the code that checks to see if the target process still
exists and aborts trying to use it if so.  To reduce the race
there, we have a new explicit check of the state of the process.

Hopefully fixes some of issue #28737082.

Change-Id: I37a7a6e9767516d564168ef5e110c4adafe3fb76

8 years agoFixed notificaiton Stress Test
Bennie Ouyang [Mon, 20 Jun 2016 18:01:54 +0000 (11:01 -0700)]
Fixed notificaiton Stress Test

Bug: 29506953
Change-Id: I8f8e7b2f0b03b48665b524472a8e81aef6a7a708

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:52:05 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:51:50 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoPrevent startNavigating() call when GPS is off
Dante Russo [Mon, 20 Jun 2016 18:11:59 +0000 (11:11 -0700)]
Prevent startNavigating() call when GPS is off

When system comes back from idle state,
GnssLocationProvider invokes startNavigating()
even when GPS is turned off in settings.

Bug: 29512509
Change-Id: Ifcc6a06d698f65f868d18244f7166663ab57f57e
CRs-Fixed: 1022372

8 years agoMerge "Only block invalidation in DrawableContainer initialization" into nyc-dev
Alan Viverette [Tue, 21 Jun 2016 13:47:19 +0000 (13:47 +0000)]
Merge "Only block invalidation in DrawableContainer initialization" into nyc-dev

8 years agoMerge \\"Documented how to handle advertisements during audio playback.\\" into mnc...
Sreevani Sreejith [Tue, 21 Jun 2016 11:55:54 +0000 (11:55 +0000)]
Merge \\"Documented how to handle advertisements during audio playback.\\" into mnc-io-docs am: 07340a654a
am: 5fef4a7d44

Change-Id: Ica1016e018fe5e278babd490b631414ad220f290

8 years agoMerge \"Documented how to handle advertisements during audio playback.\" into mnc...
sreevanis [Tue, 21 Jun 2016 11:50:22 +0000 (11:50 +0000)]
Merge \"Documented how to handle advertisements during audio playback.\" into mnc-io-docs
am: 07340a654a

Change-Id: I58c4cb8ec6d86a1bb1464a4fedd14ff21ab3a863

8 years agoMerge "Documented how to handle advertisements during audio playback." into mnc-io...
Sreevani Sreejith [Tue, 21 Jun 2016 11:44:19 +0000 (11:44 +0000)]
Merge "Documented how to handle advertisements during audio playback." into mnc-io-docs

8 years agoDocumented how to handle advertisements during audio playback.
sreevanis [Tue, 14 Jun 2016 17:39:57 +0000 (10:39 -0700)]
Documented how to handle advertisements during audio playback.

Bug:24986554
Change-Id: I02cc0500492661ae7cde6cdae30490c00f8e4b97

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 21 Jun 2016 07:53:23 +0000 (00:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8c3ebf247f9029af5c1322e2a5c115a1d854196f
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 21 Jun 2016 07:24:26 +0000 (00:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8d44c51c82552053591fd0f45741f5cf05c956d6
Auto-generated-cl: translation import

8 years agoMerge "Compare intent filter when launching adjacent" into nyc-dev
Andrii Kulian [Tue, 21 Jun 2016 05:17:58 +0000 (05:17 +0000)]
Merge "Compare intent filter when launching adjacent" into nyc-dev

8 years agoMerge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 02:56:36 +0000 (02:56 +0000)]
Merge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev

8 years agoIgnore system apps on enforceMeteredApnPolicy().
Felipe Leme [Mon, 20 Jun 2016 23:36:29 +0000 (16:36 -0700)]
Ignore system apps on enforceMeteredApnPolicy().

BUG: 29514913
Fixes: 29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259

8 years agoParse "vendor/priv-app" to find privileged applications
Jeremie GARCIA [Thu, 5 Nov 2015 17:27:59 +0000 (18:27 +0100)]
Parse "vendor/priv-app" to find privileged applications

Change-Id: Icbbafba96b7880f51ca3afcee53d5f3dd5b86a45
Signed-off-by: Jeremie GARCIA <jeremie.garcia@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bug: 29488499

8 years agoMerge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev
TreeHugger Robot [Mon, 20 Jun 2016 23:03:45 +0000 (23:03 +0000)]
Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev

8 years agoMerge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev
Wei Jia [Mon, 20 Jun 2016 22:58:32 +0000 (22:58 +0000)]
Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev

8 years agoMediaPlayer: fix java doc for setPlaybackParams.
Wei Jia [Thu, 16 Jun 2016 22:18:20 +0000 (15:18 -0700)]
MediaPlayer: fix java doc for setPlaybackParams.

Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b

8 years agoDon't try and resolve WRAP_CONTENT too early.
Robert Carr [Mon, 20 Jun 2016 22:48:42 +0000 (15:48 -0700)]
Don't try and resolve WRAP_CONTENT too early.

At the point of showDropDownPosition measure
may have not yet been called and we can't try
and resolve WRAP_CONTENT. ViewRoot will do it for us
and set requestedWidth/Height at an appropriate point.

Bug: 29496188
Change-Id: I99f26612bec800f3e321495b3df3e37b5ffb3152

8 years agoFixed an issue where the deleteintent of children wasn't sent
Selim Cinek [Mon, 20 Jun 2016 22:40:07 +0000 (15:40 -0700)]
Fixed an issue where the deleteintent of children wasn't sent

Especially in context of autobundling this could lead to bad bugs

Change-Id: Idf722f9675f6f6e49d49c08798e38e09b1c5c01e
Fixes: 29515621

8 years agoMerge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission."...
Sudheer Shanka [Mon, 20 Jun 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev

8 years agoMerge "just a reorg of some links to put all Android Studio help button redirects...
Scott Main [Mon, 20 Jun 2016 22:28:54 +0000 (22:28 +0000)]
Merge "just a reorg of some links to put all Android Studio help button redirects together" into nyc-dev

8 years agojust a reorg of some links to put all Android Studio help button redirects together
smain@google.com [Mon, 20 Jun 2016 22:25:56 +0000 (15:25 -0700)]
just a reorg of some links to put all Android Studio help button redirects together

Change-Id: If928756a87b18a12caa21effa15c5005d74f15c6

8 years agoMerge "Fix infinite loop when registering data usage callback." into nyc-dev
Antonio Cansado [Mon, 20 Jun 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Fix infinite loop when registering data usage callback." into nyc-dev

8 years agoMerge "Fix issue #29438842: Enter the "am broadcast -a..." into nyc-dev
Dianne Hackborn [Mon, 20 Jun 2016 22:09:27 +0000 (22:09 +0000)]
Merge "Fix issue #29438842: Enter the "am broadcast -a..." into nyc-dev

8 years agoFix infinite loop when registering data usage callback.
Antonio Cansado [Mon, 20 Jun 2016 22:03:03 +0000 (15:03 -0700)]
Fix infinite loop when registering data usage callback.

Trivial fix is to call the method that takes the handler as a param.

Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43

8 years agoDocs: Changed sample link under Related Samples am: ab5de09e7e
Hemal Patel [Mon, 20 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Docs: Changed sample link under Related Samples am: ab5de09e7e
am: d5af0a1214

Change-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9

8 years agoAllow trust agents to run during provisioning
Adrian Roos [Mon, 20 Jun 2016 21:58:59 +0000 (14:58 -0700)]
Allow trust agents to run during provisioning

Fixes a bug where trust agents weren't able to run during
provisioning, because user presence is only acknowledged after
provisioning completed.

Change-Id: Ib9ed235e8372555fdc40eefd0fc6b1192613abda
Fixes: 29231515

8 years agoDocs: Changed sample link under Related Samples
Hemal Patel [Mon, 20 Jun 2016 21:53:54 +0000 (21:53 +0000)]
Docs: Changed sample link under Related Samples
am: ab5de09e7e

Change-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278

8 years agoMerge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev
Roozbeh Pournader [Mon, 20 Jun 2016 21:39:20 +0000 (21:39 +0000)]
Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev

8 years agoMerge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\...
Hall Liu [Mon, 20 Jun 2016 21:31:36 +0000 (21:31 +0000)]
Merge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\" into mnc-dev am: fc32ec1aef am: aeba34533c am: 317d0cb169
am: edace5e820  -s ours

Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e

8 years agoMerge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\...
Hall Liu [Mon, 20 Jun 2016 21:28:09 +0000 (21:28 +0000)]
Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am: fc32ec1aef am: aeba34533c
am: 317d0cb169

Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23

8 years agoMerge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into...
Hall Liu [Mon, 20 Jun 2016 21:21:25 +0000 (21:21 +0000)]
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am: fc32ec1aef
am: aeba34533c

Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc

8 years agoDon't re-launch stopped activities while the device is sleeping
Wale Ogunwale [Mon, 20 Jun 2016 21:16:22 +0000 (14:16 -0700)]
Don't re-launch stopped activities while the device is sleeping

Don't ensure configuration for stopped activities while the device
is sleeping as we don't want to relaunch activities in this state.
Note that the right configuration will be applied to the activity
the next time we try to make it visible. The re-launch will happen
then.

Bug: 28518380

Change-Id: Id79d7817ba8f213d89cae6964de09cafe17481f9

8 years agoMerge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into...
Hall Liu [Mon, 20 Jun 2016 21:15:42 +0000 (21:15 +0000)]
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am: fc32ec1aef

Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0

8 years agoMerge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev
TreeHugger Robot [Mon, 20 Jun 2016 21:11:04 +0000 (21:11 +0000)]
Merge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev

8 years agoMerge "DO NOT MERGE Disable app pinning when emergency call button pressed" into...
Hall Liu [Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)]
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev

8 years agoMerge "Make advanced storage option sticky..." into nyc-dev
TreeHugger Robot [Mon, 20 Jun 2016 20:45:03 +0000 (20:45 +0000)]
Merge "Make advanced storage option sticky..." into nyc-dev

8 years agoMerge "docs: Narnia 2 advertising language update" into nyc-dev
Joe Fernandez [Mon, 20 Jun 2016 20:13:08 +0000 (20:13 +0000)]
Merge "docs: Narnia 2 advertising language update" into nyc-dev

8 years agoMerge "BatteryStats: record best estimated battery capacity" into nyc-dev
TreeHugger Robot [Mon, 20 Jun 2016 19:49:44 +0000 (19:49 +0000)]
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev