Commit Graph

277484 Commits

Author SHA1 Message Date
Chris Tate
bd2a00f848 Merge "Fix crash in clearWallpaper()" into nyc-mr1-dev 2016-09-22 22:10:13 +00:00
Ajay Panicker
5d5815dc29 [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
am: b2e88d0cb9

Change-Id: Ib3de4e5ef9dd47e7b4bd070b7dfabd295e34e9ec
2016-09-22 22:09:29 +00:00
TreeHugger Robot
b495cca72b Merge "Don't take app screenshot in minimize docked stack." into nyc-mr1-dev 2016-09-22 22:09:26 +00:00
Android Build Merger (Role)
f8033cb4f9 Merge "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 am: 4a1b8d7aba" into nyc-mr1-dev-plus-aosp 2016-09-22 22:09:13 +00:00
Ajay Panicker
108d1eedb2 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
am: 4a1b8d7aba

Change-Id: I5fa0202b264c224a155b89167cf7a1e3928854c6
2016-09-22 22:08:40 +00:00
Android Build Merger (Role)
9e616e1db1 Merge "Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am: 6b87569b4c am: 780da3b704" into nyc-mr1-dev-plus-aosp 2016-09-22 22:08:24 +00:00
Adam Powell
6b5f966c2f Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am: 6b87569b4c
am: 780da3b704

Change-Id: Ibd691f8027123ba262807faae3696aeeeb91971f
2016-09-22 22:07:30 +00:00
Android Build Merger (Role)
825c6e0dde Merge "Null check for restoring LoaderManagers am: 100ba76d7a am: bb2011a2e0" into nyc-mr1-dev-plus-aosp 2016-09-22 22:07:17 +00:00
Adam Powell
22766c9a14 Null check for restoring LoaderManagers am: 100ba76d7a
am: bb2011a2e0

Change-Id: I8afc2a6f4808d1b36c1f2651617793854e799d11
2016-09-22 22:06:38 +00:00
Android Build Merger (Role)
73713dad37 Merge "Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0b8 am: 1197c16ea7" into nyc-mr1-dev-plus-aosp 2016-09-22 22:06:21 +00:00
Wale Ogunwale
c3fcd4630e Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0b8
am: 1197c16ea7

Change-Id: Ic0eab67c6a23a22ac63da2a2a74ac168e9a0b325
2016-09-22 22:05:36 +00:00
Android Build Merger (Role)
30ed89dbca Merge "Save activity state before stopping acitivity when device sleeps am: b5066fe307 am: 3adb9d9318" into nyc-mr1-dev-plus-aosp 2016-09-22 22:05:22 +00:00
Wale Ogunwale
0f82e46fb6 Save activity state before stopping acitivity when device sleeps am: b5066fe307
am: 3adb9d9318

Change-Id: Ic18fbf92fe029a0eea3d886450a97c9877db7020
2016-09-22 22:04:36 +00:00
Android Build Merger (Role)
d92381cc1e Merge "Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev am: 10bafbd9f9 am: c2226d8db6" into nyc-mr1-dev-plus-aosp 2016-09-22 22:04:24 +00:00
Wale Ogunwale
772f779fca Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev am: 10bafbd9f9
am: c2226d8db6

Change-Id: If3118c26f0616b4f0f977132b6152f47e686448c
2016-09-22 22:03:27 +00:00
Android Build Merger (Role)
c8ceb557fd Merge "Immediately deliver new intent to paused activities. am: 03f7e9e944 am: 08d6689303" into nyc-mr1-dev-plus-aosp 2016-09-22 22:03:13 +00:00
Wale Ogunwale
2865b04701 Immediately deliver new intent to paused activities. am: 03f7e9e944
am: 08d6689303

Change-Id: I86bc60c70f373ae2a8df27ac32f27a3b665e1ac3
2016-09-22 22:02:28 +00:00
Android Build Merger (Role)
2c686e8655 Merge "Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev am: dd6230d466 am: 157b98c134" into nyc-mr1-dev-plus-aosp 2016-09-22 22:02:15 +00:00
Android Build Merger (Role)
fcc658d56b Merge "Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25 am: 4a1fd7eb3d am: bd25fec0d9" into nyc-mr1-dev-plus-aosp 2016-09-22 22:00:42 +00:00
Vladislav Kuzkokov
ec9c02133c Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev am: dd6230d466
am: 157b98c134

Change-Id: Ibe08611f4ea565da4c9da09a3579eb68d36bd0b8
2016-09-22 22:00:40 +00:00
Vladislav Kuzkokov
5d25d52900 Add DevicePolicyManager.setBackupServiceEnabled as hidden API. am: 5a122a1ce9
am: 8a48085267

Change-Id: I0dc9c4492dfac2a72fc976a1e5204c2c14ec14c4
2016-09-22 21:59:49 +00:00
Scott Main
49a0fd250f Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4 am: ba9db4b110
am: 33f2e08ec3

Change-Id: Ied825bc0503ff678200d9b117739c8dd5dc27ebe
2016-09-22 21:59:18 +00:00
Adarsh Fernando
854d5bf75b Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693 am: aff6881d04
am: 2eb458b8cd

Change-Id: I07adff6aa060877b8fa5c7be2d0285ffbdc0f5cb
2016-09-22 21:58:31 +00:00
Chris Tate
0bb29a8981 Merge "Add hidden intent extra about service availability" into nyc-mr1-dev 2016-09-22 21:58:30 +00:00
Ajay Panicker
92b85c47ac Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25 am: 4a1fd7eb3d
am: bd25fec0d9

Change-Id: I3825be4ebe408de183ad2787ca3da0c17d706e0d
2016-09-22 21:58:14 +00:00
Android Build Merger (Role)
3434f0f59e Merge "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 am: c547eeda12" into nyc-dev-plus-aosp 2016-09-22 21:57:59 +00:00
Ajay Panicker
602e5dda33 [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
am: dc9c76c306

Change-Id: I389d9e1111a3c9251f0d10e086076ae45e7c1e33
2016-09-22 21:57:46 +00:00
Jaewan Kim
f91952879c 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
am: c547eeda12

Change-Id: I883bb3f96212f7f25d3aa2310e559ec2b6cc063c
2016-09-22 21:57:25 +00:00
Jaewan Kim
c9ceffd16c 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
am: c547eeda12

Change-Id: I0163065681c16466114ee3329862bceb08c5ec4e
2016-09-22 21:57:09 +00:00
Jaewan Kim
bbf376e639 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
am: 64a14294cb

Change-Id: I095bb6e33ee549b626c0995a1b07e015513d58f6
2016-09-22 21:57:00 +00:00
Todd Kennedy
31d867d092 Merge "Add remote control of Instant Apps" into nyc-mr1-dev am: 03779f227a
am: 56054285f3

Change-Id: I2ca1e98fcf41df1300daac19b06d0bd82dc20ea7
2016-09-22 21:56:54 +00:00
Jaewan Kim
2cd4383c31 Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81
am: 585f642d65  -s ours

Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14
2016-09-22 21:56:51 +00:00
Todd Kennedy
d220683d33 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 14:56:45 -07:00
Android Build Merger (Role)
9e2319e78c Merge "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 am: 36068a2f00" into nyc-dev-plus-aosp 2016-09-22 21:56:36 +00:00
Jaewan Kim
949c938317 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
am: 36068a2f00

Change-Id: I64859a44f3c4219cfbfd3bde284be5e6d55025c3
2016-09-22 21:56:29 +00:00
Treehugger Robot
3b0256fc73 Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" 2016-09-22 21:56:10 +00:00
Ajay Panicker
d2ea0ff0cf 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
am: b937fdbbe8

Change-Id: I54f3952cfea82733b1c6312ce161e6d12aa94c2b
2016-09-22 21:56:04 +00:00
Jaewan Kim
6afd6e51fb 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
am: 36068a2f00

Change-Id: I2e7639c73505ad3016bef974fad7724c05e7e6b3
2016-09-22 21:55:59 +00:00
Jaewan Kim
a7dd993294 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5 am: 9632afe809 -s ours am: b96d410537 am: 9b790e27b7
am: 8d45b4522d

Change-Id: I8614621c0e2800749d0186c4b2170c7310eff5a6
2016-09-22 21:55:55 +00:00
Jaewan Kim
e9a9e2f055 DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9
am: ed3e26e2be  -s ours

Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e
2016-09-22 21:55:51 +00:00
Todd Kennedy
6f38e68456 Add remote control of Instant Apps am: d15bb75af6
am: f308ffc915

Change-Id: If7a6884bb896c1bab38c7d0fe963c06125a44c26
2016-09-22 21:55:44 +00:00
liulvping
fb55d69029 Merge "Skip uninstalled package for getPackagesForUid()" am: f4c8c3590a
am: 659cdfef75

Change-Id: I253117165d33dccc8544587968503f2ef61484c3
2016-09-22 21:55:31 +00:00
Colin Cross
3efa1e7c17 Merge "aapt: remove duplicate definition of ZD"
am: ac2d839d7c

Change-Id: I7f2388c9f0cd649ef79db41c67a4f07cbb18a3c9
2016-09-22 21:55:27 +00:00
TreeHugger Robot
a9375fef09 Merge "Defer launching next task until after first layout." into nyc-mr1-dev 2016-09-22 21:26:02 +00:00
Andrew Solovay
f955d4cd9f docs: Removed two images that were moved to Piper in April
Scott had migrated these graphics to Piper in April, but they've
stayed in Gerrit. These graphics had been updated in Gerrit since
then, so they got out of sync with Piper.

Set up Critique CL cr/133998971 to migrate the latest versions
to Piper (and sent to Scott for review); setting up a separate
CL here to remove the files, so they won't accidentally get
edited in the wrong place again.

Change-Id: Ice9dda71ae3604b1fc3aab15746dc41e759b80a6
2016-09-22 14:24:57 -07:00
Treehugger Robot
ac2d839d7c Merge "aapt: remove duplicate definition of ZD" 2016-09-22 21:24:49 +00:00
TreeHugger Robot
7184f8804f Merge "Avoid entering display freeze mode when using seamless rotation." into nyc-mr1-dev 2016-09-22 21:22:48 +00:00
TreeHugger Robot
2ff503b002 Merge "Fix animation glitch with overlapping orientation changes." into nyc-mr1-dev 2016-09-22 21:22:24 +00:00
TreeHugger Robot
48d24389cb Merge "Fixing index bounds exception when TaskViews are added while dismissing." into nyc-mr1-dev 2016-09-22 21:09:23 +00:00
Selim Cinek
fc7086ef65 Fixed an issue where the inline controls where not usable
Because the calculation whether a touch is on a view was incorrect
the inline controlls would always close on tablets when interacting
with them.

Change-Id: I68dcba411b34def32a044f5a4d73b396f74e9730
Fixes: 31502625
2016-09-22 14:03:41 -07:00