OSDN Git Service
Lifu Tang [Wed, 22 Jun 2016 19:56:11 +0000 (19:56 +0000)]
Merge \"Added more logs to track WakeLock usages\" into nyc-dev
am:
335387a1df
Change-Id: Ia6311e420898226086bdaedab992f9ae7c6b3f44
Lifu Tang [Wed, 22 Jun 2016 19:50:47 +0000 (19:50 +0000)]
Merge "Added more logs to track WakeLock usages" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 19:17:43 +0000 (19:17 +0000)]
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am:
0bf31c3fa6
Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
Adam Lesinski [Wed, 22 Jun 2016 19:11:34 +0000 (19:11 +0000)]
Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev
smain@google.com [Wed, 22 Jun 2016 18:52:44 +0000 (18:52 +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
am:
9802883bb3
Change-Id: Ie11cf8e7ccf0557f1cb35fcfff63a20578e2f7f8
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
Jeff Sharkey [Wed, 22 Jun 2016 18:45:01 +0000 (18:45 +0000)]
Merge \"Start primary storage move outside lock.\" into nyc-dev
am:
a3290363e1
Change-Id: I35256b066ab041703928052bbfbedb0e8f7afd49
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
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
TreeHugger Robot [Wed, 22 Jun 2016 18:36:06 +0000 (18:36 +0000)]
Merge "Start primary storage move outside lock." into nyc-dev
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
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
Adam Lesinski [Wed, 22 Jun 2016 17:37:41 +0000 (17:37 +0000)]
Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
am:
ec6db57ac7
Change-Id: I6366fcaa2b1a85b271d74df321100d590fd258a1
smain@google.com [Wed, 22 Jun 2016 17:37:35 +0000 (17:37 +0000)]
add direct path to sdk manager docs for studio UI help button bug:
28982864
am:
31b49837a1
Change-Id: I0c3fef376b787e8cf1c52b8a81221549b2921ddd
Adam Lesinski [Wed, 22 Jun 2016 17:31:34 +0000 (17:31 +0000)]
Merge "Prevent early boot crash reading PowerProfile" into nyc-dev
smain@google.com [Wed, 22 Jun 2016 17:29:07 +0000 (17:29 +0000)]
Merge \"add redirect for old link to publishing docs\" into nyc-dev
am:
7bb456d6c5
Change-Id: I6d7342cb2192c2aee0cb8fa345f525d08300feb3
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
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
Chong Zhang [Wed, 22 Jun 2016 17:24:29 +0000 (17:24 +0000)]
Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
am:
75c7cc6ca9
Change-Id: I97a3841d4862d7b8b4972d32fd43d8e99a7aacff
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
Dianne Hackborn [Wed, 22 Jun 2016 17:18:38 +0000 (17:18 +0000)]
Merge \"Fix issue #
29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
am:
a62a7eef24
Change-Id: I62361e51b439e563b91e86d6886d5b46f64737b0
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
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
Mady Mellor [Wed, 22 Jun 2016 16:54:02 +0000 (16:54 +0000)]
Merge \"Don\'t show the shade background for heads up notifications\" into nyc-dev
am:
6b6bf9cd54
Change-Id: Idda325ddbcb926f7ab57c0eba807f3f4cd1a339d
Jason Monk [Wed, 22 Jun 2016 16:53:58 +0000 (16:53 +0000)]
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
am:
126088536d
Change-Id: Ie187a5c2e062f9b51fd21e80e81cac15f02ccbe6
Todd Kennedy [Wed, 22 Jun 2016 16:53:53 +0000 (16:53 +0000)]
Merge \"Update prebuilts from build server\" into nyc-dev
am:
4001d7b6c4
Change-Id: I55f8a0231950e65338f111182a75b24b75e93c0d
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
Julia Reynolds [Wed, 22 Jun 2016 16:48:18 +0000 (16:48 +0000)]
Don\'t iterate over a list items are removed from.
am:
00d9d9f11e
Change-Id: I206627eafbfb274dcd27dfba41a4e9d06db9d2ac
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
Todd Kennedy [Wed, 22 Jun 2016 16:46:02 +0000 (16:46 +0000)]
Merge "Update prebuilts from build server" into nyc-dev
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
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
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
Jason Monk [Wed, 22 Jun 2016 15:44:06 +0000 (15:44 +0000)]
Merge \"QS: Fix default icon handling for services\" into nyc-dev
am:
94a20367b5
Change-Id: I20510a1397c304695596e4e8315d3cb428d26a74
Sid Soundararajan [Wed, 22 Jun 2016 15:44:02 +0000 (15:44 +0000)]
Merge \"Blacklist ATV Remote Service to never appear on Recents\" into nyc-dev
am:
8f41c074c7
Change-Id: I0191a58f0777732bc879cabbe2808c76381e18c8
Jason Monk [Wed, 22 Jun 2016 15:39:29 +0000 (15:39 +0000)]
Merge "QS: Fix default icon handling for services" 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
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
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
Yoshinori Hirano [Wed, 22 Jun 2016 13:30:08 +0000 (13:30 +0000)]
Merge \"Restrict hotspot qs tile to admin user\" into nyc-dev
am:
ba568a46e6
Change-Id: I4b13eb4c37ae5b21bde74bbf55e77f51fb8ae238
Jason Monk [Wed, 22 Jun 2016 13:30:04 +0000 (13:30 +0000)]
Merge \"QS Edit: Try to simplify drag logic\" into nyc-dev
am:
3a0241566b
Change-Id: Iadeeb7937feed24f8b591aac36da3d90a7a1e4d2
Jason Monk [Wed, 22 Jun 2016 13:23:25 +0000 (13:23 +0000)]
Merge "Restrict hotspot qs tile to admin user" 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
Nicolas Prevot [Wed, 22 Jun 2016 12:33:43 +0000 (12:33 +0000)]
Merge \"Don\'t allow showing an activity if user is stopping or shutting down.\" into nyc-dev
am:
2058553b8d
Change-Id: I5f7cdfb398f74cd0c0ed172a001094e438190e6d
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
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
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
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
Todd Kennedy [Wed, 22 Jun 2016 01:25:27 +0000 (01:25 +0000)]
Merge \"Revert \"Parse \"vendor/priv-app\" to find privileged applications\"\" into nyc-dev
am:
c211539769
Change-Id: I7cdf1552c49f51f7f633f09796453cdd6ce10a26
Eric Laurent [Wed, 22 Jun 2016 01:17:42 +0000 (01:17 +0000)]
Merge \"Fix JAVA doc for AudioRecord and AudioTrack Builder\" into nyc-dev
am:
34ed8ad3c2
Change-Id: I1de0df33e6e8f8a453d9c94302d16722d2a0a4a6
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
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
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
Dirk Dougherty [Wed, 22 Jun 2016 00:53:01 +0000 (00:53 +0000)]
Merge \"Doc change: remove common images from localized directories.\" into nyc-dev
am:
cdb7434140
Change-Id: Ie7db6e0c1ad664c93241b5c153f559b4a364bad8
Adrian Roos [Wed, 22 Jun 2016 00:41:35 +0000 (00:41 +0000)]
Merge \"Notification: Respect disabled HUNs on updates\" into nyc-dev
am:
394cc084f9
Change-Id: Ief37365ae7569c76633137b661a2b50e2110670d
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
TreeHugger Robot [Wed, 22 Jun 2016 00:35:28 +0000 (00:35 +0000)]
Merge "Notification: Respect disabled HUNs on updates" into nyc-dev
Adrian Roos [Tue, 21 Jun 2016 23:33:40 +0000 (23:33 +0000)]
Merge \"Fix stale transformations\" into nyc-dev
am:
ea16efd52c
Change-Id: I14088360a948f5e4ef94c5171a2a603b75bbf0e9
Sudheer Shanka [Tue, 21 Jun 2016 23:33:36 +0000 (23:33 +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
am:
e4e424d80d
Change-Id: I228853b196bd660f3c55f616278700e6623f9783
Sudheer Shanka [Tue, 21 Jun 2016 23:33:33 +0000 (23:33 +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
am:
00e79982aa
Change-Id: I190e3d96763d241bbff2346e4c21f368e5906103
TreeHugger Robot [Tue, 21 Jun 2016 23:25:14 +0000 (23:25 +0000)]
Merge "Fix stale transformations" into nyc-dev
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
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
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
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
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
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
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
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
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
Sudheer Shanka [Tue, 21 Jun 2016 22:46:23 +0000 (22:46 +0000)]
Merge \\\\\"Add pm operation to set user restrictions.\\\\\" into mnc-dev am:
144b3a42cc am:
f43aa2e837 am:
916728bb35 am:
4e8aa0f35f -s ours
am:
b0de5fd328
Change-Id: I3a751b6cada4c412ce67f3e160936c10f129d07e
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
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
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
Sudheer Shanka [Tue, 21 Jun 2016 22:42:16 +0000 (22:42 +0000)]
Merge \\\\\"Reduce shell power over user management.\\\\\" into mnc-dev am:
964500fd43 am:
9bfa0ad22f am:
fb87ae59b0 am:
63e8198685 -s ours
am:
a5e89439ff
Change-Id: Ic5b771c9d8738f6c3a60bb9332c964b26829047a
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
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
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
Selim Cinek [Tue, 21 Jun 2016 22:33:11 +0000 (22:33 +0000)]
Merge \"Do animations correctly in systemUI\" into nyc-dev
am:
afa0f25379
Change-Id: Ie72b24e7d84ab4025b0ab148a859ab211c1fdf70
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
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
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
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
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
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
TreeHugger Robot [Tue, 21 Jun 2016 22:20:43 +0000 (22:20 +0000)]
Merge "Do animations correctly in systemUI" into nyc-dev
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
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
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
Kevin Hufnagle [Tue, 21 Jun 2016 22:13:49 +0000 (22:13 +0000)]
Merge \\\"docs: Noted that orderId is blank for all test purchases.\\\" into mnc-io-docs am:
b47e5dc798 am:
1b0751e097
am:
97fb7a734f
Change-Id: Ib92f816a4ac4a07928d839773a878b6044e98e62
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
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
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
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
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
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
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
Sudheer Shanka [Tue, 21 Jun 2016 22:03:09 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into mnc-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
Sudheer Shanka [Tue, 21 Jun 2016 22:03:04 +0000 (22:03 +0000)]
Merge "Reduce shell power over user management." into mnc-dev
OSDN Git Service
