Commit Graph

252662 Commits

Author SHA1 Message Date
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
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
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

Change-Id: I9d22f3dd260464e2aa82e33c7b0764c5bfae9a4e
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

Change-Id: I06e443fa305dea4f8465158eeca19931d89cfd71
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

Change-Id: I4389cf598e8aa4789717439da450c7de3e9e37dc
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

Change-Id: I2cf340eb0f26edadc1edb6bcdf052c45082e3794
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

Change-Id: Id58741db4a95f6cb381531d3b9d9a2a9ce67350e
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

Change-Id: I6a22e59059ff3224de00b756684998392124eb5a
2016-09-22 19:56:53 +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
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
Vladislav Kuzkokov
dd6230d466 Merge "Add DevicePolicyManager.setBackupServiceEnabled as hidden API." into nyc-mr1-dev 2016-09-22 17:09:06 +00:00
TreeHugger Robot
03779f227a Merge "Add remote control of Instant Apps" into nyc-mr1-dev 2016-09-22 16:57:17 +00:00
Ajay Panicker
45c45d359e [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
2016-09-22 16:38:14 +00:00
Jaewan Kim
08ca31273c 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
2016-09-22 16:37:06 +00:00
Jaewan Kim
9b790e27b7 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
2016-09-22 16:35:42 +00:00
Jaewan Kim
83ded12e86 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
2016-09-22 16:34:39 +00:00
Jaewan Kim
53adfd6294 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
2016-09-22 16:33:47 +00:00
Ajay Panicker
b809b1f8aa 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
2016-09-22 16:32:31 +00:00
Ajay Panicker
6ffdf43ec3 [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
2016-09-22 16:31:34 +00:00
Ajay Panicker
d91f2f4d2b 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
2016-09-22 16:30:28 +00:00
Ajay Panicker
8e3293e81f [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
2016-09-22 16:08:32 +00:00
Wale Ogunwale
03f7e9e944 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
2016-09-22 09:04:09 -07:00
Ajay Panicker
34b14060c1 [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
2016-09-22 14:48:37 +00:00
Wale Ogunwale
b5066fe307 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
2016-09-22 07:32:40 -07:00
Ajay Panicker
7e78a89923 [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
2016-09-22 14:24:38 +00:00
Jaewan Kim
ca887d4372 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
2016-09-22 14:24:35 +00:00
Ajay Panicker
081bea189d [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
2016-09-22 14:22:50 +00:00
Jaewan Kim
c56cabef9d 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
2016-09-22 13:57:14 +00:00
Ajay Panicker
a71d1c416b [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
2016-09-22 13:32:52 +00:00
Jaewan Kim
245e33a0b1 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
2016-09-22 12:26:49 +00:00
Ajay Panicker
ffe6090f7e [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
2016-09-22 11:58:28 +00:00
Jaewan Kim
36aa253b2b 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
2016-09-22 11:22:51 +00:00
Jaewan Kim
b96d410537 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
2016-09-22 10:59:39 +00:00
Jaewan Kim
61fda61d20 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
2016-09-22 10:58:44 +00:00
Jaewan Kim
78efad6418 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
2016-09-22 10:57:53 +00:00
Ajay Panicker
c5442c263a 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
2016-09-22 10:56:50 +00:00
Ajay Panicker
b2a1dcb913 [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
2016-09-22 10:55:43 +00:00
Ajay Panicker
745254f98b 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
2016-09-22 10:54:53 +00:00
Ajay Panicker
9338ffa148 [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
2016-09-22 10:53:39 +00:00
Jaewan Kim
963c269ffa 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
2016-09-22 10:52:37 +00:00
Jaewan Kim
a13096f4c5 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
2016-09-22 10:52:34 +00:00
Jaewan Kim
091681149b 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
2016-09-22 10:50:05 +00:00
Bill Yi
b1056852a5 Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: 994ec6a0ec  -s ours

Change-Id: Ida7cf9408ad94d3a17fc7b1154f0644c1ae33442
2016-09-22 10:23:07 +00:00
Bill Yi
563510e1b6 Import translations. DO NOT MERGE
am: a6c51e2c94  -s ours

Change-Id: I4e82725c53421b83579b8f3ced716366eaa8df51
2016-09-22 10:23:04 +00:00
TreeHugger Robot
6856972e4b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-22 09:54:12 +00:00
TreeHugger Robot
994ec6a0ec Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev 2016-09-22 09:53:02 +00:00
TreeHugger Robot
d5d5dc2473 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-22 09:52:00 +00:00
Ajay Panicker
bc12dda3a7 [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
2016-09-22 09:38:13 +00:00