Android Build Merger (Role)
9570466f2d
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 am: f91952879c" into nyc-mr1-dev
2016-09-22 22:14:44 +00:00
Jaewan Kim
dcbae98c53
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
...
am: f91952879c
2016-09-22 22:11:50 +00:00
Android Build Merger (Role)
02b5a0579b
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 am: 949c938317" into nyc-mr1-dev
2016-09-22 22:11:30 +00:00
Jaewan Kim
55aed3d49a
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
...
am: 949c938317
2016-09-22 22:10:39 +00:00
Chris Tate
bd2a00f848
Merge "Fix crash in clearWallpaper()" into nyc-mr1-dev
2016-09-22 22:10:13 +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
Chris Tate
0bb29a8981
Merge "Add hidden intent extra about service availability" into nyc-mr1-dev
2016-09-22 21:58:30 +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
2016-09-22 21:57:25 +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
2016-09-22 21:56:29 +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
2016-09-22 21:56:04 +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
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
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
Jeff Sharkey
8423493a85
Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev
2016-09-22 20:40:11 +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
2016-09-22 20:35:06 +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
2016-09-22 20:35:00 +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
2016-09-22 20:33:44 +00:00
Dirk Dougherty
f7f3f0f401
Copy IN files to ID, temporarily leaving IN in place. am: 9bbc0a2421
...
am: d6490cf9c0
2016-09-22 20:33:03 +00: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
2016-09-22 20:07:44 +00:00
Adarsh Fernando
2eb458b8cd
Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693
...
am: aff6881d04
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
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
2016-09-22 20:05:55 +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
2016-09-22 20:04:32 +00:00
Dirk Dougherty
d6490cf9c0
Copy IN files to ID, temporarily leaving IN in place.
...
am: 9bbc0a2421
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
2016-09-22 20:03:53 +00:00
Wale Ogunwale
f5d1e35316
Don't take app screenshot in minimize docked stack.
...
When the docked stack is minimized its app windows are cropped
significantly so any screenshot taken will not display the apps
contain. So, we avoid taking a screenshot in that case.
This situation is going to be improve some in O when we switch
recents to also use saved surfaces in which cases it will be able
to display the last app content the user saw vs. just the app's
background color.
Bug: 29830173
Change-Id: I003aa074126ddcb57d5ff6dda756293146646196
2016-09-22 13:03:23 -07:00
Jaewan Kim
8d45b4522d
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
2016-09-22 20:02:03 +00:00
Jaewan Kim
3e2f3c2e31
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
2016-09-22 20:01:06 +00:00
Jaewan Kim
5886b4ca7b
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
2016-09-22 20:00:10 +00:00
Ajay Panicker
0471ffa55c
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
2016-09-22 19:58:43 +00:00
Ajay Panicker
5fc21fdbcc
[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
2016-09-22 19:57:44 +00:00
Ajay Panicker
c20376b2a0
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
2016-09-22 19:56:53 +00:00
Ajay Panicker
916552b0c9
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
2016-09-22 19:56:50 +00:00
Winson
ffaf07fed0
Fixing index bounds exception when TaskViews are added while dismissing.
...
Bug: 31518216
Change-Id: I749aa45f54d80d524f069922ac09d2f781c87f86
2016-09-22 19:47:41 +00:00
Winson
96f78f5046
Fixing RTL issues with transition and screen pinning.
...
Bug: 31367531
Change-Id: Id790293cc5246535d6fb829ec57e4ee640fea1a2
2016-09-22 19:47:31 +00:00
Winson
bd53a314f4
Defer launching next task until after first layout.
...
Bug: 30192607
Change-Id: I04cd182a795ea9600c9782056dc0adbe9a288af6
2016-09-22 19:46:15 +00:00
TreeHugger Robot
6b87569b4c
Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev
2016-09-22 19:29:25 +00:00
TreeHugger Robot
8da796d0b8
Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev
2016-09-22 19:27:27 +00:00
TreeHugger Robot
10bafbd9f9
Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev
2016-09-22 19:26:36 +00:00
Ajay Panicker
0ec10c8fdc
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
2016-09-22 19:23:06 +00:00
Todd Kennedy
52f179fd0e
Pass url to the AIA supervisor
...
The supervisor needs the URL in order to start the correct AIA.
Change-Id: Ied9b50031b31f6da07196efbccbb27cacda1355f
Fixes: 31664252
Test: manually ran through ephemeral scenario
2016-09-22 12:23:03 -07:00
Jaewan Kim
dd883c7e87
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
2016-09-22 19:01:08 +00:00
Jaewan Kim
0e31d93890
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
2016-09-22 19:00:14 +00:00
Jeff Sharkey
7e2bb3e6dd
Recursively restorecon when SELinux label changes.
...
PackageManager has been pretty aggressive about asking installd to
restorecon over app data when it thinks something might have
changed. However, in the vast majority of cases these are no-op
requests, and we waste a bunch of time recursively walking all
private data, easily costing 60+ seconds on dogfooder devices.
This change relies on new installd "create_app_data" behavior that
kicks off a recursive restorecon if it detects that the top-level
SELinux label on the app private data directory changes. This means
that PackageManager no longer needs to track restoreconNeeded state.
Test: booted, verified that a label change triggered restorecon
Bug: 30768146
Change-Id: I0c8d4018cf8ff888d0ae07a82adc3d61a6002aad
2016-09-22 12:22:09 -06:00
Ajay Panicker
2a214fc5f2
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
2016-09-22 18:07:40 +00:00
Adam Powell
100ba76d7a
Null check for restoring LoaderManagers
...
Bug 31671195
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java
Change-Id: Ib553f7611814cc6759488aec505fd126ee664a9d
2016-09-22 10:53:45 -07:00
