Commit Graph

277484 Commits

Author SHA1 Message Date
TreeHugger Robot
00dc65158d Merge "Fixing RTL issues with transition and screen pinning." into nyc-mr1-dev 2016-09-22 21:01:11 +00:00
TreeHugger Robot
bce1e8c836 Merge "Pass url to the AIA supervisor" into nyc-mr1-dev 2016-09-22 20:56:16 +00:00
Jaewan Kim
3babfefdb4 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours am: 91ccfa1def am: 4167620d33 am: 2c9ad0ff81 am: b6d6519e34 -s ours am: 61fda61d20 am: 83ded12e86
am: 3e2f3c2e31

Change-Id: I75a62471c3c975b6af6cf5364fa59beda442e9df
2016-09-22 20:43:33 +00:00
Jaewan Kim
fdad028484 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993 am: 1adff2ee05 -s ours am: 78efad6418 am: 53adfd6294
am: 5886b4ca7b

Change-Id: I45a85477c89ca2f291f29b99864baff1d2afc29b
2016-09-22 20:42:30 +00:00
Android Build Merger (Role)
b380c545d2 Merge "DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours am: 2ccdbce954 am: aff8ee6351" into nyc-mr1-dev-plus-aosp 2016-09-22 20:41:56 +00:00
Ajay Panicker
0487464b69 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349 am: c9830d56e5 -s ours am: c5442c263a am: b809b1f8aa
am: 0471ffa55c

Change-Id: Ifcce2c9d4c19c5fd3e4dd11cd55f8b379972bc72
2016-09-22 20:41:10 +00:00
Jaewan Kim
aa3262bde4 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours am: 2ccdbce954
am: aff8ee6351

Change-Id: I6e5f890d16517bb9bea3e8c03fc1f364b1a10849
2016-09-22 20:40:59 +00:00
Android Build Merger (Role)
04f7418362 Merge "Merge "Revert fixed at links." into nyc-dev am: c77b72f244 am: ed870fccb4" into nyc-mr1-dev-plus-aosp 2016-09-22 20:40:39 +00:00
Ajay Panicker
b2e88d0cb9 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8 am: 3d4c737736 am: f6d8037708 am: 90eafb5322 -s ours am: b2a1dcb913 am: 6ffdf43ec3
am: 5fc21fdbcc

Change-Id: Id840dfd2c1a424173932ac6c1ddf0c722bbf98fa
2016-09-22 20:40:22 +00:00
Jeff Sharkey
8423493a85 Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev 2016-09-22 20:40:11 +00:00
Elliot Waite
60748cb208 Merge "Revert fixed at links." into nyc-dev am: c77b72f244
am: ed870fccb4

Change-Id: Id541747a9bcc1011b2197653b1dde02d84b2cf0f
2016-09-22 20:39:57 +00:00
Android Build Merger (Role)
c036bb1261 Merge "Revert fixed at links. am: 7c70fed347 am: ef69678105" into nyc-mr1-dev-plus-aosp 2016-09-22 20:39:39 +00:00
Ajay Panicker
4a1b8d7aba Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours am: 745254f98b am: d91f2f4d2b
am: c20376b2a0

Change-Id: I2e260246a45043ec46f9ffec2eb4147d310c7dc3
2016-09-22 20:39:33 +00:00
Elliot Waite
4ae458ffdc Revert fixed at links. am: 7c70fed347
am: ef69678105

Change-Id: I39e63504cd598497571a6d8dee8abf34ac2441fa
2016-09-22 20:38:57 +00:00
Android Build Merger (Role)
29f2030001 Merge "Found a couple of more references to Android N. am: 9af57aa309 am: 4c9ecfbd01" into nyc-mr1-dev-plus-aosp 2016-09-22 20:38:34 +00:00
Adam Powell
780da3b704 Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev
am: 6b87569b4c

Change-Id: I3ec24a57b6f4da270926a6b6b2f0f231d6d703f1
2016-09-22 20:38:03 +00:00
Adam Powell
bb2011a2e0 Null check for restoring LoaderManagers
am: 100ba76d7a

Change-Id: I7b5eecf24d73fd62abaa2825374bd936f15425e5
2016-09-22 20:38:00 +00:00
Adarsh Fernando
b44c904cef Found a couple of more references to Android N. am: 9af57aa309
am: 4c9ecfbd01

Change-Id: I5613c66a25fa9f50a2981d17ef7fad369ea012c8
2016-09-22 20:37:52 +00:00
Android Build Merger (Role)
97f67891e1 Merge "Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37 am: df9659a112" into nyc-mr1-dev-plus-aosp 2016-09-22 20:37:32 +00:00
Adarsh Fernando
043946c385 Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37
am: df9659a112

Change-Id: If254ebcc7e0636bf95626475495e868b65cc922b
2016-09-22 20:36:51 +00:00
Wale Ogunwale
1197c16ea7 Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev
am: 8da796d0b8

Change-Id: Id15c28c138026fdf9c5b596fbea3b20f4e7e72c2
2016-09-22 20:36:39 +00:00
Wale Ogunwale
3adb9d9318 Save activity state before stopping acitivity when device sleeps
am: b5066fe307

Change-Id: I95e897de48a9f5b10728110b5b3c9d379f86f695
2016-09-22 20:36:32 +00:00
Android Build Merger (Role)
8ac28b8659 Merge "Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12" into nyc-dev-plus-aosp 2016-09-22 20:35:10 +00:00
Ajay Panicker
b937fdbbe8 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2 am: 0ec10c8fdc -s ours
am: 916552b0c9

Change-Id: I50571a7570a8f98d2e1b473694534ac478b060b7
2016-09-22 20:35:06 +00:00
Wale Ogunwale
c2226d8db6 Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev
am: 10bafbd9f9

Change-Id: I5c51c9749fe14a047a17e2e41ac28de0d8fe7d6c
2016-09-22 20:35:03 +00:00
Jaewan Kim
c547eeda12 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87
am: 832179120f  -s ours

Change-Id: Iefcfa52c1a34b05102c7188b3e7232584cffba53
2016-09-22 20:35:00 +00:00
Wale Ogunwale
08d6689303 Immediately deliver new intent to paused activities.
am: 03f7e9e944

Change-Id: I962edc54a173b204a5b24fb3d1871500852d35c2
2016-09-22 20:34:59 +00:00
Jaewan Kim
585f642d65 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79
am: 462493ee81

Change-Id: I822c5aeb87aea023aa8dba38a4beb6de98225f4a
2016-09-22 20:34:22 +00:00
Jaewan Kim
36068a2f00 DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890
am: 4da22f27f6  -s ours

Change-Id: Ie18197c55022197b4dcc9f8e2d45cb5cc78dcdd0
2016-09-22 20:33:44 +00:00
Ajay Panicker
92bc04cbf9 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470 am: 1783182332 am: 993015ce9a am: 8e172c638d -s ours am: 9338ffa148 am: 7e78a89923 am: 8e3293e81f
am: b412f807af

Change-Id: I5e2d033cedfb65f825a160a478bea44e69f55721
2016-09-22 20:33:28 +00:00
Colin Cross
57ef0a40f1 Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397
am: 6f02f57f12

Change-Id: Iba0bb317fb0df1e2c5189dde3743f21bdd00ec38
2016-09-22 20:33:25 +00:00
Jaewan Kim
ed3e26e2be DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9
am: 3ea1f124f9

Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1
2016-09-22 20:33:24 +00:00
Ajay Panicker
b5b69a2004 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2 am: 0ec10c8fdc -s ours
am: 916552b0c9

Change-Id: Iacc0a20de196e47f351cc6010712b5ed4053ab77
2016-09-22 20:33:21 +00:00
Dirk Dougherty
f7f3f0f401 Copy IN files to ID, temporarily leaving IN in place. am: 9bbc0a2421
am: d6490cf9c0

Change-Id: I2cbda43317e0b2b089a6f750364e4795a0ed3ae3
2016-09-22 20:33:03 +00:00
liulvping
659cdfef75 Merge "Skip uninstalled package for getPackagesForUid()"
am: f4c8c3590a

Change-Id: I1e4f7913cc00635611440faabcab4faff7f35dc5
2016-09-22 20:30:51 +00:00
Todd Kennedy
e2d4f5fc31 Force APKs to be streamed
When using the new "cmd" command, APKs must be streamed instead of specifying
a file.

Change-Id: I977cd817ac545d7c5293f53b9fa4b155bea7449e
Fixes: 31251489
Test: manually installed packages using 'adb install', 'adb shell cmd package install' and 'adb shell pm install'
2016-09-22 13:26:50 -07:00
Robert Carr
c67c2a91dd Don't halt movement notifications when display is frozen.
Halting movement notifications while the display is frozen
can result in failure to deliver them in rotation scenarios.

Bug: 31313118
Change-Id: I41708ceb10d193fda95cdd715dde0509102dcbbf
2016-09-22 13:25:45 -07:00
Christopher Tate
a2bd512034 Fix crash in clearWallpaper()
The underlying clearWallpaper() service method demands that only a
single kind of wallpaper be specified as the target; but a recent
patch attempted to expand the client-side legacy method to apply to
all kinds of wallpaper, incorrectly.  This patch corrects that client-
side code to do things properly.

Bug 30456015

Change-Id: I0a881957b881206e5eb775c6879ba90f10f9ffb0
2016-09-22 13:18:05 -07:00
Scott Main
33f2e08ec3 Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4
am: ba9db4b110

Change-Id: I3201bc9d32830160df518f86fd8e2dd1a82c0694
2016-09-22 20:07:44 +00:00
Adarsh Fernando
b8cda11351 Docs: Cleanup of Preview language in Android 7.0 docs. am: 4b6d939321
am: ce73af6cd2

Change-Id: I39a613b0469f6725c6bc936b8678327b869b5c5f
2016-09-22 20:07:20 +00:00
Adarsh Fernando
2eb458b8cd Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693
am: aff6881d04

Change-Id: I12e8fb355025be757a119245ea8a02e8e5c2222f
2016-09-22 20:06:54 +00:00
Jaewan Kim
832179120f Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243
am: dd883c7e87

Change-Id: Id9a90d8d49724435fced962b42a89edbb90846c3
2016-09-22 20:05:57 +00:00
Ajay Panicker
dc9c76c306 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours am: 7f84596929 -s ours am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994 -s ours am: bc12dda3a7 am: ffe6090f7e am: a71d1c416b am: 081bea189d -s ours am: 34b14060c1
am: 45c45d359e

Change-Id: I52e03aba7bcb227200e97ffb5bae44cfa0925977
2016-09-22 20:05:55 +00:00
Jaewan Kim
462493ee81 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours
am: ded4df2e79

Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61
2016-09-22 20:05:49 +00:00
Pavlin Radoslavov
74f60c0de8 Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind
Add a missing call to remove all MESSAGE_BIND_PROFILE_SERVICE
message when unbinding and finishing.

Bug: 31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7e9a8f79a38d4eb8ab8b53be04650226fc72732e
2016-09-22 20:05:22 +00:00
Jaewan Kim
64a14294cb Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0 am: a13096f4c5 -s ours am: 36aa253b2b
am: 08ca31273c

Change-Id: Id73d3b75067ee95c366816862a8e4bd80cb3d17e
2016-09-22 20:04:32 +00:00
Etan Cohen
d48845629b Merge "[NAN] Method renames based on API council feedback" am: dcac00f325 am: 3501748dea
am: 6b6c719dd2

Change-Id: I5ea3e18bbaec7875b3720febfd4bbdcb97c92883
2016-09-22 20:04:04 +00:00
Jaewan Kim
3ea1f124f9 DO NOT MERGE Fix build am: dfedca4e43 -s ours
am: 499871ebe9

Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a
2016-09-22 20:03:57 +00:00
Dirk Dougherty
d6490cf9c0 Copy IN files to ID, temporarily leaving IN in place.
am: 9bbc0a2421

Change-Id: If43965eae6d174f7dbfb182b06c357be8fd67bc3
2016-09-22 20:03:56 +00:00
Jaewan Kim
4da22f27f6 DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3
am: 0e31d93890

Change-Id: I7f0dc285e10f6786137f6446dc77a53fe1549dfc
2016-09-22 20:03:53 +00:00