OSDN Git Service
Android Build Merger (Role) [Thu, 22 Sep 2016 22:11:28 +0000 (22:11 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 22:10:39 +0000 (22:10 +0000)]
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
Change-Id: I49a3b4a43b0f84df33c1f1d4a68d2dea4c44ce8b
Chris Tate [Thu, 22 Sep 2016 22:10:11 +0000 (22:10 +0000)]
Merge "Fix crash in clearWallpaper()" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 22:09:24 +0000 (22:09 +0000)]
Merge "Don't take app screenshot in minimize docked stack." into nyc-mr1-dev
Chris Tate [Thu, 22 Sep 2016 21:58:27 +0000 (21:58 +0000)]
Merge "Add hidden intent extra about service availability" into nyc-mr1-dev
Jaewan Kim [Thu, 22 Sep 2016 21:56:29 +0000 (21:56 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 21:56:04 +0000 (21:56 +0000)]
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
TreeHugger Robot [Thu, 22 Sep 2016 21:26:00 +0000 (21:26 +0000)]
Merge "Defer launching next task until after first layout." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 21:22:46 +0000 (21:22 +0000)]
Merge "Avoid entering display freeze mode when using seamless rotation." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 21:22:20 +0000 (21:22 +0000)]
Merge "Fix animation glitch with overlapping orientation changes." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 21:09:21 +0000 (21:09 +0000)]
Merge "Fixing index bounds exception when TaskViews are added while dismissing." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 21:01:09 +0000 (21:01 +0000)]
Merge "Fixing RTL issues with transition and screen pinning." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 20:56:13 +0000 (20:56 +0000)]
Merge "Pass url to the AIA supervisor" into nyc-mr1-dev
Jeff Sharkey [Thu, 22 Sep 2016 20:40:08 +0000 (20:40 +0000)]
Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev
Ajay Panicker [Thu, 22 Sep 2016 20:35:06 +0000 (20:35 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 20:33:44 +0000 (20:33 +0000)]
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
Dirk Dougherty [Thu, 22 Sep 2016 20:33:03 +0000 (20:33 +0000)]
Copy IN files to ID, temporarily leaving IN in place. am:
9bbc0a2421
am:
d6490cf9c0
Change-Id: I2cbda43317e0b2b089a6f750364e4795a0ed3ae3
Christopher Tate [Thu, 22 Sep 2016 20:18:05 +0000 (13:18 -0700)]
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
Scott Main [Thu, 22 Sep 2016 20:07:44 +0000 (20:07 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am:
8b05feb5b4
am:
ba9db4b110
Change-Id: I3201bc9d32830160df518f86fd8e2dd1a82c0694
Adarsh Fernando [Thu, 22 Sep 2016 20:06:54 +0000 (20:06 +0000)]
Removing a temporary redirect for /ndk/guides/cmake.html am:
dafcbfa693
am:
aff6881d04
Change-Id: I12e8fb355025be757a119245ea8a02e8e5c2222f
Ajay Panicker [Thu, 22 Sep 2016 20:05:55 +0000 (20:05 +0000)]
[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
Jaewan Kim [Thu, 22 Sep 2016 20:04:32 +0000 (20:04 +0000)]
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
Dirk Dougherty [Thu, 22 Sep 2016 20:03:56 +0000 (20:03 +0000)]
Copy IN files to ID, temporarily leaving IN in place.
am:
9bbc0a2421
Change-Id: If43965eae6d174f7dbfb182b06c357be8fd67bc3
Jaewan Kim [Thu, 22 Sep 2016 20:03:53 +0000 (20:03 +0000)]
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
Wale Ogunwale [Thu, 22 Sep 2016 15:34:42 +0000 (08:34 -0700)]
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
Jaewan Kim [Thu, 22 Sep 2016 20:02:03 +0000 (20:02 +0000)]
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
Change-Id: I9d22f3dd260464e2aa82e33c7b0764c5bfae9a4e
Jaewan Kim [Thu, 22 Sep 2016 20:01:06 +0000 (20:01 +0000)]
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
Change-Id: I06e443fa305dea4f8465158eeca19931d89cfd71
Jaewan Kim [Thu, 22 Sep 2016 20:00:10 +0000 (20:00 +0000)]
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
Change-Id: I4389cf598e8aa4789717439da450c7de3e9e37dc
Ajay Panicker [Thu, 22 Sep 2016 19:58:43 +0000 (19:58 +0000)]
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
Change-Id: I2cf340eb0f26edadc1edb6bcdf052c45082e3794
Ajay Panicker [Thu, 22 Sep 2016 19:57:44 +0000 (19:57 +0000)]
[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
Change-Id: Id58741db4a95f6cb381531d3b9d9a2a9ce67350e
Ajay Panicker [Thu, 22 Sep 2016 19:56:53 +0000 (19:56 +0000)]
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
Change-Id: I6a22e59059ff3224de00b756684998392124eb5a
Ajay Panicker [Thu, 22 Sep 2016 19:56:50 +0000 (19:56 +0000)]
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
Change-Id: I66bfa158fdf948f36a98c20c3afc7ee7d73bb920
Winson [Wed, 21 Sep 2016 19:13:55 +0000 (12:13 -0700)]
Fixing index bounds exception when TaskViews are added while dismissing.
Bug:
31518216
Change-Id: I749aa45f54d80d524f069922ac09d2f781c87f86
Winson [Wed, 21 Sep 2016 19:14:16 +0000 (12:14 -0700)]
Fixing RTL issues with transition and screen pinning.
Bug:
31367531
Change-Id: Id790293cc5246535d6fb829ec57e4ee640fea1a2
Winson [Wed, 21 Sep 2016 19:13:32 +0000 (12:13 -0700)]
Defer launching next task until after first layout.
Bug:
30192607
Change-Id: I04cd182a795ea9600c9782056dc0adbe9a288af6
TreeHugger Robot [Thu, 22 Sep 2016 19:29:21 +0000 (19:29 +0000)]
Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 19:27:25 +0000 (19:27 +0000)]
Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 19:26:34 +0000 (19:26 +0000)]
Merge "Immediately deliver new intent to paused activities." into nyc-mr1-dev
Ajay Panicker [Thu, 22 Sep 2016 19:23:06 +0000 (19:23 +0000)]
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
Change-Id: I95bd7f14d35808722c0453e6e441d3bc96528010
Todd Kennedy [Wed, 21 Sep 2016 22:53:50 +0000 (15:53 -0700)]
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
Jaewan Kim [Thu, 22 Sep 2016 19:00:14 +0000 (19:00 +0000)]
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
Change-Id: I03db2d87943557beb6a98aa72f986c1ad0f7f03d
Jeff Sharkey [Thu, 22 Sep 2016 17:35:31 +0000 (11:35 -0600)]
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
Ajay Panicker [Thu, 22 Sep 2016 18:07:40 +0000 (18:07 +0000)]
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
Change-Id: I579d7384e9a12e942a0afcd80fc41e9f2877eedb
Adam Powell [Thu, 22 Sep 2016 17:47:40 +0000 (10:47 -0700)]
Null check for restoring LoaderManagers
Bug
31671195
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java
Change-Id: Ib553f7611814cc6759488aec505fd126ee664a9d
Dirk Dougherty [Thu, 22 Sep 2016 17:21:29 +0000 (10:21 -0700)]
Copy IN files to ID, temporarily leaving IN in place.
Change-Id: I1a92e4254fe57817cb555629059539aaec47e182
Vladislav Kuzkokov [Thu, 22 Sep 2016 17:09:02 +0000 (17:09 +0000)]
Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev
Scott Main [Thu, 22 Sep 2016 16:57:45 +0000 (16:57 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
am:
8b05feb5b4
Change-Id: Ib2367374818a66cb257ab772204dc1be79e47242
Adarsh Fernando [Thu, 22 Sep 2016 16:57:42 +0000 (16:57 +0000)]
Removing a temporary redirect for /ndk/guides/cmake.html
am:
dafcbfa693
Change-Id: I8c190be258c96b33d31b400f6c935a4a40fe722e
TreeHugger Robot [Thu, 22 Sep 2016 16:57:11 +0000 (16:57 +0000)]
Merge "Add remote control of Instant Apps" into nyc-mr1-dev
Ajay Panicker [Thu, 22 Sep 2016 16:38:14 +0000 (16:38 +0000)]
[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
Change-Id: I017086383136e5a16bc5328046781bc584043f6c
Jaewan Kim [Thu, 22 Sep 2016 16:37:06 +0000 (16:37 +0000)]
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
Change-Id: I93fc78c253458ec31b7ea34e34c3124bf7f557b7
Jaewan Kim [Thu, 22 Sep 2016 16:35:42 +0000 (16:35 +0000)]
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
Change-Id: If9781b819c9baa55597daaf2ed03b2886739f56e
Jaewan Kim [Thu, 22 Sep 2016 16:34:39 +0000 (16:34 +0000)]
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
Change-Id: I9159be101773b421df3b23ec02d0f7ec8cb64b4a
Jaewan Kim [Thu, 22 Sep 2016 16:33:47 +0000 (16:33 +0000)]
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
Change-Id: I1eb3eba4342a7af62ebbc3a9f4e90e58b5adcac2
Ajay Panicker [Thu, 22 Sep 2016 16:32:31 +0000 (16:32 +0000)]
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
Change-Id: Ib205c5e83f800dbb2a41b812fc0840f2b4029874
Ajay Panicker [Thu, 22 Sep 2016 16:31:34 +0000 (16:31 +0000)]
[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
Change-Id: I3b8c695133c8631e7f058b9fd26da13d69d23735
Ajay Panicker [Thu, 22 Sep 2016 16:30:28 +0000 (16:30 +0000)]
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
Change-Id: I35793a0332aaeb572a288d7806aed2bc43879dab
Ajay Panicker [Thu, 22 Sep 2016 16:08:32 +0000 (16:08 +0000)]
[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
Change-Id: I3027a2d1f49280a39eff5711413f38e6c48117b6
Wale Ogunwale [Thu, 22 Sep 2016 16:04:09 +0000 (09:04 -0700)]
Immediately deliver new intent to paused activities.
ag/
1437028 tried to fix this problem, but limited intent
delivery to only paused activities in a minimized docked stack
to reduce the effect of the change since we are late in the
release cycle. However, it didn't completely solve the problem
for example when the ChooserActivity comes up in the fullscreen
stack un-minimizing the docked stack and then the user selects
the app in the docked stack from ChooserActivity.
We now immediately deliver intents to paused activities as they
are currently visible to the user and we want the user to see
the visual effects caused by the intent delivery now.
Bug:
31371093
Change-Id: I94f9717da66daa512071bb96e62b2f9811691a78
Scott Main [Thu, 22 Sep 2016 15:22:38 +0000 (15:22 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
Ajay Panicker [Thu, 22 Sep 2016 14:48:37 +0000 (14:48 +0000)]
[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
Change-Id: Ic3f72935e96e7b6f7b3a69474451d3edd418dd24
Wale Ogunwale [Wed, 21 Sep 2016 14:33:43 +0000 (07:33 -0700)]
Save activity state before stopping acitivity when device sleeps
Makes it consistent with the regular stop code path and allows
for the activity to be relaunched with the right state if a
relaunch happens after stop due to sleep.
Bug:
30241363
Change-Id: I92edfe6e0e3f5c7ce3b56d49df31e601a798cd4f
Ajay Panicker [Thu, 22 Sep 2016 14:24:38 +0000 (14:24 +0000)]
[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
Change-Id: I92ec98b22ea071df0a24d19f8a6bb4523606089d
Jaewan Kim [Thu, 22 Sep 2016 14:24:35 +0000 (14:24 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102 am:
5decf8e715 -s ours am:
963c269ffa
am:
c56cabef9d
Change-Id: I8b96206d95e5da72027a62251c910903230946d9
Jaewan Kim [Thu, 22 Sep 2016 14:23:38 +0000 (14:23 +0000)]
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
Change-Id: I5e9cb821711f13d536af5d3d5d42595f0e286559
Ajay Panicker [Thu, 22 Sep 2016 14:22:50 +0000 (14:22 +0000)]
[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
Change-Id: Ib0ef4b276401795bbe64b35cf4caa9a173eaec21
Jaewan Kim [Thu, 22 Sep 2016 13:57:14 +0000 (13:57 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102 am:
5decf8e715 -s ours
am:
963c269ffa
Change-Id: Ife5fa9fb43fb28eb8e71a7707c846c58d18478b4
Ajay Panicker [Thu, 22 Sep 2016 13:33:07 +0000 (13:33 +0000)]
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
Change-Id: Ia40c8390390d5612ad53c649d14516871bfba8e9
Ajay Panicker [Thu, 22 Sep 2016 13:32:52 +0000 (13:32 +0000)]
[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
Change-Id: I6d48f72f00bd10d6013753db78883cec67c68568
Jaewan Kim [Thu, 22 Sep 2016 13:31:57 +0000 (13:31 +0000)]
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
Change-Id: I1db1ad50bfd89c038f9d226109958011aeb1496e
Ajay Panicker [Thu, 22 Sep 2016 12:28:51 +0000 (12:28 +0000)]
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
Change-Id: I2e790e95077c0760d1be6d984e7e90fb62a3d9db
Jaewan Kim [Thu, 22 Sep 2016 12:26:49 +0000 (12:26 +0000)]
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:
091681149b
Change-Id: I0fb73df3b32342897159f99b8f1ee99b975f8874
Ajay Panicker [Thu, 22 Sep 2016 11:58:28 +0000 (11:58 +0000)]
[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
Change-Id: Ib99bfa28add599f964b1b669de22fd653e42b02a
Jaewan Kim [Thu, 22 Sep 2016 11:22:51 +0000 (11:22 +0000)]
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
Change-Id: I5b9a7bb6faae813c9b4f6beeb8f96dfb5ad3cc3b
Jaewan Kim [Thu, 22 Sep 2016 11:21:01 +0000 (11:21 +0000)]
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
Change-Id: I21b359b1471ee527a2bc975c399253def98e40fe
Jaewan Kim [Thu, 22 Sep 2016 10:59:39 +0000 (10:59 +0000)]
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
Change-Id: I68e31867b8c925717eda87a426add614f731f77a
Jaewan Kim [Thu, 22 Sep 2016 10:58:44 +0000 (10:58 +0000)]
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
Change-Id: Idda087e0cbccf3e94dd23a41156cdcc14a4b2459
Jaewan Kim [Thu, 22 Sep 2016 10:57:53 +0000 (10:57 +0000)]
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
Change-Id: I99f14369c3f5f4388a17b85720a45bde8ee4c5be
Ajay Panicker [Thu, 22 Sep 2016 10:56:50 +0000 (10:56 +0000)]
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
Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90
Ajay Panicker [Thu, 22 Sep 2016 10:55:43 +0000 (10:55 +0000)]
[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
Change-Id: I21edab5680d1cc4f5afa74ab9764f0ff945a44cc
Ajay Panicker [Thu, 22 Sep 2016 10:54:53 +0000 (10:54 +0000)]
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
Change-Id: Iedd8920de15034413968efa125fa544b5a25e87c
Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]
[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
Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0
Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102
am:
5decf8e715 -s ours
Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e
Jaewan Kim [Thu, 22 Sep 2016 10:52:34 +0000 (10:52 +0000)]
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
Change-Id: Ib54fc420bb43c312f72f5c72bb38b97550db9da9
Jaewan Kim [Thu, 22 Sep 2016 10:50:05 +0000 (10:50 +0000)]
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
Change-Id: Iede8b78ecc2ae054266286d69317b655263deacc
Bill Yi [Thu, 22 Sep 2016 10:23:07 +0000 (10:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am:
994ec6a0ec -s ours
Change-Id: Ida7cf9408ad94d3a17fc7b1154f0644c1ae33442
Bill Yi [Thu, 22 Sep 2016 10:23:04 +0000 (10:23 +0000)]
Import translations. DO NOT MERGE
am:
a6c51e2c94 -s ours
Change-Id: I4e82725c53421b83579b8f3ced716366eaa8df51
TreeHugger Robot [Thu, 22 Sep 2016 09:54:10 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Ajay Panicker [Thu, 22 Sep 2016 09:53:30 +0000 (09:53 +0000)]
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
Change-Id: I6e5bb9fea57cf5fe9cff68952d6b2878ce005d7c
TreeHugger Robot [Thu, 22 Sep 2016 09:53:00 +0000 (09:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:51:57 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Ajay Panicker [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]
[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
Change-Id: I51723f883566989133b0c8be92108b8c910c0981
Jaewan Kim [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +0000)]
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
Change-Id: I373b66ee022f14d331729531c450eb18f8572d9b
Jaewan Kim [Thu, 22 Sep 2016 09:37:34 +0000 (09:37 +0000)]
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
Change-Id: I3f09cc3c507244d1999ed280002e1354d25db9d2
Jaewan Kim [Thu, 22 Sep 2016 09:35:44 +0000 (09:35 +0000)]
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
Change-Id: I8db6ebc6704a60d44739e873038403c2740304e3
Jaewan Kim [Thu, 22 Sep 2016 09:14:33 +0000 (09:14 +0000)]
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
Change-Id: I57e8a4e6b415683cba317afa012880b8ac12bff6
Jaewan Kim [Thu, 22 Sep 2016 09:13:26 +0000 (09:13 +0000)]
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
Change-Id: I6a216c2e2ddb6b9959e9691c5014c0d29b6c453d
Jaewan Kim [Thu, 22 Sep 2016 09:13:22 +0000 (09:13 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours
am:
8dffbcd169 -s ours
Change-Id: Ida4217e4a0392c2f58b1ef3d0229bad4229c838d
Jaewan Kim [Thu, 22 Sep 2016 09:13:16 +0000 (09:13 +0000)]
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
Change-Id: I9d7b96411a566e6fa4ad4c8d263140245b427b44
Jaewan Kim [Thu, 22 Sep 2016 08:45:58 +0000 (08:45 +0000)]
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
Change-Id: Id2538e101907fe6a3dc5cb284ecf93a392a047ba