Commit Graph

245159 Commits

Author SHA1 Message Date
TreeHugger Robot
c211539769 Merge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev 2016-06-22 01:13:56 +00:00
Eric Laurent
34ed8ad3c2 Merge "Fix JAVA doc for AudioRecord and AudioTrack Builder" into nyc-dev 2016-06-22 01:08:45 +00:00
Dirk Dougherty
cdb7434140 Merge "Doc change: remove common images from localized directories." into nyc-dev 2016-06-22 00:38:27 +00:00
TreeHugger Robot
394cc084f9 Merge "Notification: Respect disabled HUNs on updates" into nyc-dev 2016-06-22 00:35:30 +00:00
TreeHugger Robot
ea16efd52c Merge "Fix stale transformations" into nyc-dev 2016-06-21 23:25:16 +00:00
Sudheer Shanka
e4e424d80d 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
2016-06-21 23:17:44 +00:00
Sudheer Shanka
565d13f17e 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
2016-06-21 23:14:52 +00:00
Adrian Roos
f6967e0691 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
2016-06-21 16:13:05 -07:00
Sudheer Shanka
00e79982aa 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
2016-06-21 23:11:08 +00:00
Sudheer Shanka
80e720742b 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
2016-06-21 23:10:54 +00:00
Sudheer Shanka
95c9bef53b 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
2016-06-21 23:05:02 +00:00
Sudheer Shanka
9088be4ebe 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
2016-06-21 22:55:40 +00:00
Sudheer Shanka
5e41f90a92 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
2016-06-21 22:42:25 +00:00
Sudheer Shanka
b0de5fd328 Merge \\\\"Add pm operation to set user restrictions.\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35
am: 4e8aa0f35f  -s ours

Change-Id: Id82e4921ebc46dcf802acad895410ed79026d9ce
2016-06-21 22:42:23 +00:00
Sudheer Shanka
06c3f60136 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
2016-06-21 22:42:23 +00:00
Sudheer Shanka
a5e89439ff Merge \\\\"Reduce shell power over user management.\\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f am: fb87ae59b0
am: 63e8198685  -s ours

Change-Id: Id8035a1dde1a4ec04779e68ae14df5d2d4e2530f
2016-06-21 22:38:39 +00:00
Sudheer Shanka
e01775f0be 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
2016-06-21 22:36:46 +00:00
Sudheer Shanka
199f6a490a 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
2016-06-21 22:36:43 +00:00
Sudheer Shanka
47da8a0bdc 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
2016-06-21 22:31:11 +00:00
Sudheer Shanka
0d457d1254 Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev am: e64034a27d -s ours am: db7e70c2f0
am: e0cc5e20ae

Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6
2016-06-21 22:31:09 +00:00
Sudheer Shanka
a9b937b29d Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am: b43fe62933 -s ours
am: 96676a2d41

Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1
2016-06-21 22:25:34 +00:00
Sudheer Shanka
4e8aa0f35f Merge \\\"Add pm operation to set user restrictions.\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837
am: 916728bb35

Change-Id: Id7990003b3a5a6db9f9d16eb57ec37d47505165a
2016-06-21 22:25:31 +00:00
Sudheer Shanka
e0cc5e20ae Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am: e64034a27d -s ours
am: db7e70c2f0

Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
2016-06-21 22:25:31 +00:00
Sudheer Shanka
63e8198685 Merge \\\"Reduce shell power over user management.\\\" into mnc-dev am: 964500fd43 am: 9bfa0ad22f
am: fb87ae59b0

Change-Id: I4e517e522896242fb9b23b21c217c6fd876ef8b7
2016-06-21 22:25:19 +00:00
TreeHugger Robot
afa0f25379 Merge "Do animations correctly in systemUI" into nyc-dev 2016-06-21 22:20:45 +00:00
Sudheer Shanka
916728bb35 Merge \\"Add pm operation to set user restrictions.\\" into mnc-dev am: 144b3a42cc
am: f43aa2e837

Change-Id: Ic6c3cf2871105e5f81bbd30ee30311b5d5a535a6
2016-06-21 22:19:09 +00:00
Sudheer Shanka
fb87ae59b0 Merge \\"Reduce shell power over user management.\\" into mnc-dev am: 964500fd43
am: 9bfa0ad22f

Change-Id: I952f6a12be0c1edc6027ccce785d47d7f84757ef
2016-06-21 22:19:05 +00:00
Todd Kennedy
56b9656372 Revert "Parse "vendor/priv-app" to find privileged applications"
This reverts commit 02708b1ac4.

Change-Id: Ie1ba362a9f5ee46516a79c35bd4a6e45f84b6a32
2016-06-21 22:14:55 +00:00
Eric Laurent
0f0da49fce 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
2016-06-21 15:12:31 -07:00
Sudheer Shanka
96676a2d41 Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am: b43fe62933  -s ours

Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
2016-06-21 22:12:17 +00:00
Sudheer Shanka
db7e70c2f0 Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
am: e64034a27d  -s ours

Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1
2016-06-21 22:12:15 +00:00
Sudheer Shanka
f43aa2e837 Merge \"Add pm operation to set user restrictions.\" into mnc-dev
am: 144b3a42cc

Change-Id: I1de4650ef53751654145a3ad1c40390711414341
2016-06-21 22:11:47 +00:00
Sudheer Shanka
9bfa0ad22f Merge \"Reduce shell power over user management.\" into mnc-dev
am: 964500fd43

Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9
2016-06-21 22:11:44 +00:00
Kevin Hufnagle
97fb7a734f Merge \\"docs: Noted that orderId is blank for all test purchases.\\" into mnc-io-docs am: b47e5dc798
am: 1b0751e097

Change-Id: Ib7fd5bb44a40b721b7893ff3bdd51bbf0e9a278b
2016-06-21 22:04:45 +00:00
Sudheer Shanka
b43fe62933 Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev 2016-06-21 22:03:16 +00:00
Sudheer Shanka
144b3a42cc Merge "Add pm operation to set user restrictions." into mnc-dev 2016-06-21 22:03:13 +00:00
Sudheer Shanka
e64034a27d Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev 2016-06-21 22:03:09 +00:00
Sudheer Shanka
964500fd43 Merge "Reduce shell power over user management." into mnc-dev 2016-06-21 22:03:05 +00:00
Kevin Hufnagle
1b0751e097 Merge \"docs: Noted that orderId is blank for all test purchases.\" into mnc-io-docs
am: b47e5dc798

Change-Id: I3aece10845f33bf2867f2450a9657e9d55152ba1
2016-06-21 21:58:30 +00:00
Kevin Hufnagle
b47e5dc798 Merge "docs: Noted that orderId is blank for all test purchases." into mnc-io-docs 2016-06-21 21:53:51 +00:00
TreeHugger Robot
472224cd81 Merge "Prevent startNavigating() call when GPS is off" into nyc-dev 2016-06-21 21:47:26 +00:00
Chris Wren
7595478ff2 Merge "registerUpdatedByApp should be synchronized" into nyc-dev 2016-06-21 21:46:35 +00:00
Sudheer Shanka
8cc7430667 DO NOT MERGE: Add pm operation to set user restrictions.
Bug: 29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
2016-06-21 21:43:51 +00:00
TreeHugger Robot
72ce991692 Merge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev 2016-06-21 21:24:02 +00:00
Yorke Lee
22faa5ddb1 Merge "Tweaks to DragAndDropPermissions behavior" into nyc-dev 2016-06-21 21:10:53 +00:00
Selim Cinek
843f541737 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
2016-06-21 14:03:30 -07:00
Dirk Dougherty
a99b2bd622 Doc change: remove common images from localized directories.
Change-Id: Ia06a34ae09b9f6bdd855cbb579ee6d97cd9863a4
2016-06-21 13:49:54 -07:00
Bennie Ouyang
2f59ee10b2 Merge "Fixed notificaiton Stress Test" into nyc-dev 2016-06-21 20:42:03 +00:00
Yorke Lee
c8ad0cd316 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
2016-06-21 12:57:52 -07:00
TreeHugger Robot
aab580af55 Merge "Always report window move to client" into nyc-dev 2016-06-21 19:55:55 +00:00