Nicolas Prévot
2058553b8d
Merge "Don't allow showing an activity if user is stopping or shutting down." into nyc-dev
2016-06-22 12:27:14 +00:00
Nicolas Prevot
1219c924bd
Don't allow showing an activity if user is stopping or shutting down.
...
BUG:29264996
Change-Id: I9fc97c5dc37e6d5656b82b277954b5963eb345c4
2016-06-22 10:21:16 +01:00
Dianne Hackborn
121e1645d1
Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...
...isn't respected if previous job was scheduled with same URI
Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07:00
Chong Zhang
5022da313f
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 afb776d544
2016-06-21 19:44:09 -07:00
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
Adam Lesinski
4ece3d6bb1
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
2016-06-21 17:55:58 -07: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
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
2016-06-21 23:14:52 +00:00
smain@google.com
bc364fc1a1
add redirect for old link to publishing docs
...
Change-Id: Iabf814d79783c8dd9e815243292519e43b1bbf9e
2016-06-21 16:14:08 -07: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
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
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
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
2016-06-21 22:55:40 +00:00
Sid Soundararajan
6f134fb3ef
Blacklist ATV Remote Service to never appear on Recents
...
BUG: 28764678
Change-Id: I0be5f9f408f16cfb683793a84cef7a368e5fa867
2016-06-21 15:49:13 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
2016-06-21 22:19:05 +00:00
Todd Kennedy
56b9656372
Revert "Parse "vendor/priv-app" to find privileged applications"
...
This reverts commit 02708b1ac4
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
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
2016-06-21 22:12:15 +00:00
Sudheer Shanka
f43aa2e837
Merge \"Add pm operation to set user restrictions.\" into mnc-dev
...
am: 144b3a42cc
2016-06-21 22:11:47 +00:00
Sudheer Shanka
9bfa0ad22f
Merge \"Reduce shell power over user management.\" into mnc-dev
...
am: 964500fd43
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
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
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
