OSDN Git Service
TreeHugger Robot [Wed, 20 Sep 2017 00:18:07 +0000 (00:18 +0000)]
Merge "Delete unused interface IAM.swapDockedAndFullscreenStack()"
TreeHugger Robot [Wed, 20 Sep 2017 00:09:09 +0000 (00:09 +0000)]
Merge "ActivityOptions.set/getLaunchStackId() be gone!"
Philip Quinn [Mon, 18 Sep 2017 16:47:48 +0000 (09:47 -0700)]
Add HeadsUpManager as a SystemUI dependency.
Bug:
65849819
Test: make -j
Change-Id: Id4386aa267c512b9828480d42214b51093e73587
Daniel Sandler [Wed, 20 Sep 2017 00:04:51 +0000 (00:04 +0000)]
Merge "OWNERS files don't really work with groups yet."
Dan Sandler [Tue, 19 Sep 2017 23:38:18 +0000 (19:38 -0400)]
OWNERS files don't really work with groups yet.
Test: n/a
Exempt-From-Owner-Approval: for obvious reasons
Change-Id: Ie41fbae528fa213e092411b38dda5a84b1288b22
Bryce Lee [Tue, 19 Sep 2017 23:41:16 +0000 (23:41 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev am:
1c2a6921c0
am:
dbb33c058b
Change-Id: If3caf66edc965a46df24e2aaf4e73b83aebcbf67
Bryce Lee [Tue, 19 Sep 2017 23:32:17 +0000 (23:32 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev
am:
1c2a6921c0
Change-Id: I06e858733e21220b6008bd55c2d4119bc51cd2cd
Bryce Lee [Tue, 19 Sep 2017 23:21:54 +0000 (23:21 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev
Bryce Lee [Fri, 15 Sep 2017 00:06:41 +0000 (17:06 -0700)]
Consider task's root activity when determining if resizable.
We consider an activity resizable if the root activity of the its
parent task is resizable. This changelist adds this condition to
consideration.
Change-Id: I4162ff7eb6cad3f4a3f9fdf35ccc0b0d2383ff15
Fixes:
65668913
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests#testCanBeLaunchedOnDisplay
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testLaunchNonResizeableActivityFromSecondaryDisplaySameTask
Felipe Leme [Tue, 19 Sep 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev am:
2748ffcef7
am:
667fb12d37
Change-Id: Ib4d8b85be3d38131d606569913939d10199c63f7
Felipe Leme [Tue, 19 Sep 2017 23:01:33 +0000 (23:01 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
am:
2748ffcef7
Change-Id: I912d263f40e3d1cc58c77f2a91c585bb97aa3c37
TreeHugger Robot [Tue, 19 Sep 2017 22:47:16 +0000 (22:47 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
Ajay Nadathur [Tue, 19 Sep 2017 22:37:44 +0000 (22:37 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am:
19e00be16b
am:
f4f1c4d425
Change-Id: I0045019061b59d08e576a0c343f694804668870a
Calin Juravle [Tue, 19 Sep 2017 22:30:03 +0000 (22:30 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev am:
479af339de
am:
97de54bdda
Change-Id: Iaeb4ce6d248ae988ffd68a609bb572d600bc1698
Ajay Nadathur [Tue, 19 Sep 2017 22:26:00 +0000 (22:26 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am:
19e00be16b
Change-Id: I2ba4882632e59141c9b1de697928d5a3a7a413fc
Calin Juravle [Tue, 19 Sep 2017 22:20:29 +0000 (22:20 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev am:
d78d269650
am:
3489d1900b
Change-Id: I274b9c580e1e399e9575ba7de23925666f2e9276
Calin Juravle [Tue, 19 Sep 2017 22:17:53 +0000 (22:17 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev
am:
479af339de
Change-Id: I1ce2dd66298058e26e623ed39eec413575a10a7c
TreeHugger Robot [Tue, 19 Sep 2017 22:13:28 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 22:09:56 +0000 (22:09 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
am:
d78d269650
Change-Id: I18243e9c77c921d5b860ccfe4bb021e21e8bb5e7
Calin Juravle [Tue, 19 Sep 2017 21:58:14 +0000 (21:58 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 21:56:41 +0000 (21:56 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 21:14:26 +0000 (21:14 +0000)]
Merge "Make sure wm Stack gets override config on creation"
Sundeep Ghuman [Tue, 19 Sep 2017 21:11:09 +0000 (21:11 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev am:
7b911fbdaf
am:
e62793a173
Change-Id: I61b9a273c95bb99085882c06ea209685fedd8c48
TreeHugger Robot [Tue, 19 Sep 2017 21:02:10 +0000 (21:02 +0000)]
Merge "Make NetworkController tests more deterministic"
Sundeep Ghuman [Tue, 19 Sep 2017 21:01:55 +0000 (21:01 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
am:
7b911fbdaf
Change-Id: I9f75901dcbaace37a44971a0e2b2dba02dedfa00
John Reck [Tue, 19 Sep 2017 21:00:03 +0000 (21:00 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev am:
879a9677b9
am:
7d7022f73a
Change-Id: Id45c62c6b7dd8f080ab54a1c2ee439fb0dd10c34
TreeHugger Robot [Tue, 19 Sep 2017 20:52:49 +0000 (20:52 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
Arthur Ishiguro [Tue, 19 Sep 2017 20:50:59 +0000 (20:50 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev am:
0853fe8a53
am:
7c5be53554
Change-Id: Iff30607c66ae8b42307bce3e42f7f9f3471e8d03
John Reck [Tue, 19 Sep 2017 20:48:24 +0000 (20:48 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
am:
879a9677b9
Change-Id: I62eeec65e62e5f4d422b95847b7bbab93e1a4fbe
Arthur Ishiguro [Tue, 19 Sep 2017 20:42:28 +0000 (20:42 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
am:
0853fe8a53
Change-Id: Icefb1d6d21bcebfc5b16e5ec234c9f1c6043717f
TreeHugger Robot [Tue, 19 Sep 2017 20:33:25 +0000 (20:33 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 20:32:56 +0000 (20:32 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
Android Build Merger (Role) [Tue, 19 Sep 2017 20:15:27 +0000 (20:15 +0000)]
Merge "Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev am:
93243bf808 am:
b39679d4c4"
TreeHugger Robot [Tue, 19 Sep 2017 20:14:46 +0000 (20:14 +0000)]
Merge "Fix crash in TextView#setHint"
Christopher Tate [Tue, 19 Sep 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev am:
93243bf808
am:
b39679d4c4
Change-Id: I9284ceee64957730cb6a9e0cd8542ae528808a8c
Wale Ogunwale [Tue, 19 Sep 2017 20:07:39 +0000 (13:07 -0700)]
Delete unused interface IAM.swapDockedAndFullscreenStack()
Deleting so I don't have to convert to the new windowing model later.
Test: Existing test pass.
Change-Id: I6adbe11348e3f01f4e32d8b404b6399d5eff7152
Christopher Tate [Tue, 19 Sep 2017 20:04:35 +0000 (20:04 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
am:
93243bf808
Change-Id: Ibb5a539d306c58a21844ff97e0ac2678dd55c8e3
TreeHugger Robot [Tue, 19 Sep 2017 19:50:42 +0000 (19:50 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 19:34:34 +0000 (19:34 +0000)]
Merge "Fix navbar colors on power menu"
Fyodor Kupolov [Tue, 19 Sep 2017 19:04:36 +0000 (19:04 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29 am:
c17b4e5a14 am:
80e87f97c3
am:
c9117ddbfa
Change-Id: I6e565af0ec462e57ae38f0c4f09b8c52bb5c6ab4
Fyodor Kupolov [Tue, 19 Sep 2017 18:56:45 +0000 (18:56 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29 am:
c17b4e5a14
am:
80e87f97c3
Change-Id: Iff2f6a0dff9774d155961aafade36eeb5db5bc81
Felipe Leme [Tue, 19 Sep 2017 16:06:20 +0000 (09:06 -0700)]
Autofill optimization: don't contact server when session is finished.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
65414762
Change-Id: I214a7835727c3ff71de9dc65c8d6fe54507265fb
Fyodor Kupolov [Tue, 19 Sep 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Fix AddAccountSettings memory leak" am:
104501fa29
am:
c17b4e5a14
Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee
Fyodor Kupolov [Tue, 19 Sep 2017 18:42:07 +0000 (18:42 +0000)]
Merge "Fix AddAccountSettings memory leak"
am:
104501fa29
Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
TreeHugger Robot [Tue, 19 Sep 2017 18:38:45 +0000 (18:38 +0000)]
Merge "Sysui doesn't have a bp, it has an mk..."
Jason Monk [Tue, 19 Sep 2017 13:52:43 +0000 (09:52 -0400)]
Make NetworkController tests more deterministic
Test: runtest systemui
Fixes:
63386204
Change-Id: I371c6897c929e70e61a44e116c5a508f494eff0c
Fyodor Kupolov [Tue, 19 Sep 2017 18:29:14 +0000 (18:29 +0000)]
Merge "Fix AddAccountSettings memory leak"
David Stevens [Tue, 19 Sep 2017 18:13:46 +0000 (18:13 +0000)]
Merge "Handle showWhenLocked on secondary displays"
TreeHugger Robot [Tue, 19 Sep 2017 18:00:20 +0000 (18:00 +0000)]
Merge "Fix VectorDrawable dirty flag logic"
Arthur Ishiguro [Mon, 18 Sep 2017 19:07:44 +0000 (12:07 -0700)]
Adds handle to NanoAppInstanceInfo Parcel
- Since mHandle (UID) was not recorded in writeToParcel, it always
returned 0 as the UID. This resulted in error messages claiming
mismatches between the reported and actual UID of nanoapps when called
from an external process.
- Also fixes the Parcel constructor to actually read the mContexthubId
field.
Bug:
37785458
Test: Compile and load, verify error message doesn't appear
Change-Id: I2ff75f510aae549c741786f5746862256ea5a877
Wale Ogunwale [Fri, 8 Sep 2017 20:29:37 +0000 (13:29 -0700)]
ActivityOptions.set/getLaunchStackId() be gone!
Removed ActivityOptions.set/getLaunchStackId() and replacement
ActivityOptions.set/getWindowingMode() and set/getActivityType()
Test: Existing tests pass.
Test: go/wm-smoke
Bug:
64146578
Change-Id: Ifc1c35f7b13c335cdf1a1694208e9fe0aea0c1fa
Tyler Gunn [Tue, 19 Sep 2017 17:05:49 +0000 (17:05 +0000)]
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025 am:
c26e534bef" into oc-mr1-dev-plus-aosp
am:
dfcd7852a2
Change-Id: Iff9efc0b5dbb0593592f95db5924d045cc68d8e1
Fyodor Kupolov [Tue, 19 Sep 2017 17:01:11 +0000 (17:01 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev am:
14b86be8da
am:
48a272464c
Change-Id: I46e7494178f86e56faa214cca709fd360659cb73
Android Build Merger (Role) [Tue, 19 Sep 2017 16:56:47 +0000 (16:56 +0000)]
Merge "Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025 am:
c26e534bef" into oc-mr1-dev-plus-aosp
Tyler Gunn [Tue, 19 Sep 2017 16:52:09 +0000 (16:52 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda am:
8b2e421025
am:
c26e534bef
Change-Id: I447794014fe74f6efb4c712808704b8b0f8bc43f
David Stevens [Tue, 19 Sep 2017 16:51:58 +0000 (16:51 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev am:
71267deb18
am:
2f5c306b82
Change-Id: I5dba0293e924890977f5ce2333152dffdd8132ee
Fyodor Kupolov [Tue, 19 Sep 2017 16:51:50 +0000 (16:51 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
am:
14b86be8da
Change-Id: I7902b082d55063a902576b300295a771b64238b4
Fyodor Kupolov [Tue, 19 Sep 2017 16:45:39 +0000 (16:45 +0000)]
Merge "Allow to enable WAL for testing" into oc-mr1-dev
Tyler Gunn [Tue, 19 Sep 2017 16:44:26 +0000 (16:44 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables." am:
99d28ebbda
am:
8b2e421025
Change-Id: I2b73595add333660c2a4b62538334b8cb38ac9cb
David Stevens [Tue, 19 Sep 2017 16:44:05 +0000 (16:44 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev
am:
71267deb18
Change-Id: I8c84eed94013f07e1c0eabe020cd4e8eeee1f7ba
Tyler Gunn [Tue, 19 Sep 2017 16:37:38 +0000 (16:37 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
am:
99d28ebbda
Change-Id: I99ff94901868d3b16a20a6592e106bc0645b863e
David Stevens [Tue, 19 Sep 2017 16:35:28 +0000 (16:35 +0000)]
Merge "Listen for device power state for VrMode" into oc-mr1-dev
Tyler Gunn [Tue, 19 Sep 2017 16:28:52 +0000 (16:28 +0000)]
Merge "Fix ImsCallProfile parceling and add protection for invalid parcelables."
TreeHugger Robot [Tue, 19 Sep 2017 15:36:52 +0000 (15:36 +0000)]
Merge "Fix reliability triggering"
TreeHugger Robot [Tue, 19 Sep 2017 14:36:52 +0000 (14:36 +0000)]
Merge "Improve WMP dumpsys readability."
Stan Iliev [Thu, 14 Sep 2017 14:58:26 +0000 (10:58 -0400)]
Fix VectorDrawable dirty flag logic
Pass VD staging dirty flag value to the render thread dirty flag.
This is fixing animation on growing VD bounds, which looked bad
because cache was not refreshed and scaling it up 100 times did
not look good.
Test: Ran GoogleCamera app and HWUI unit tests.
Bug:
65534766
Change-Id: Ie83cbb6839c772556340b4ec526ba3699fc84255
Neil Fuller [Wed, 13 Sep 2017 20:59:59 +0000 (21:59 +0100)]
Fix reliability triggering
Fix reliability triggering in the time zone update
feature. The reliability triggering is there to
resume an update check when things go wrong. For
example, if the device is turned off after a
time zone data app is updated but before the time
zone update process has finished pulling the data
out and installing it in /data. The reliability
trigger happens when the device is idle and will
complete the work.
The idle triggering currently doesn't work as it
was implemented incorrectly.
The code has been changed to use the
JobScheduler to trigger on idle and scheduling
has been made explicit.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w \
com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above
Test: Manual testing: adb shell am idle-maintenance, adb logcat/adb shell dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug:
65657543
Change-Id: Ibb2c537955d09a5d538c50490dae94a518522f19
Jason Monk [Tue, 19 Sep 2017 13:25:35 +0000 (09:25 -0400)]
Sysui doesn't have a bp, it has an mk...
Test: none
Change-Id: I8e2516f5bfc4ba4e53c240a977b6939f834cb319
TreeHugger Robot [Tue, 19 Sep 2017 12:58:32 +0000 (12:58 +0000)]
Merge "[RefactoredBMS] Use buffered DataInputStream vs RandomAccessFile"
Joachim Sauer [Tue, 19 Sep 2017 12:54:59 +0000 (12:54 +0000)]
Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev am:
61faffd75b
am:
101c0258cc
Change-Id: I4eb02e0ebc0132f8d434c51fe53cc648d8310293
Joachim Sauer [Tue, 19 Sep 2017 12:45:27 +0000 (12:45 +0000)]
Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev
am:
61faffd75b
Change-Id: I58020aa141a55750059a57063cea30bcc706e908
Joachim Sauer [Tue, 19 Sep 2017 12:39:01 +0000 (12:39 +0000)]
Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev
Android Build Merger (Role) [Tue, 19 Sep 2017 12:21:59 +0000 (12:21 +0000)]
Merge "Merge "Special handling of priv-apps in Zygote." am:
46af70cad9 am:
79d4ef6caa am:
836f2fe701 am:
0bd07225e7"
Nicolas Geoffray [Tue, 19 Sep 2017 12:19:26 +0000 (12:19 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9 am:
79d4ef6caa am:
836f2fe701
am:
0bd07225e7
Change-Id: I21e4726a7e76a4d595cd819d64b2fcc1aa2dfd6d
Nicolas Geoffray [Tue, 19 Sep 2017 12:11:51 +0000 (12:11 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9 am:
79d4ef6caa
am:
836f2fe701
Change-Id: Ieb8b53e69ac14be6e4e0e0210f12343e7e863b66
Nicolas Geoffray [Tue, 19 Sep 2017 12:03:38 +0000 (12:03 +0000)]
Merge "Special handling of priv-apps in Zygote." am:
46af70cad9
am:
79d4ef6caa
Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25
Nicolas Geoffray [Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)]
Merge "Special handling of priv-apps in Zygote."
am:
46af70cad9
Change-Id: I1dbf2313c9ee1c014854630eac5f1429548ae7f6
Nicolas Geoffray [Tue, 19 Sep 2017 11:47:58 +0000 (11:47 +0000)]
Merge "Special handling of priv-apps in Zygote."
Michal Karpinski [Tue, 19 Sep 2017 10:35:59 +0000 (11:35 +0100)]
[RefactoredBMS] Use buffered DataInputStream vs RandomAccessFile
This CL replicates ag/
2239004 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: Id83445d433987730c5cdf9b9684b647baf3c3d1b
Michal Karpinski [Tue, 19 Sep 2017 10:07:58 +0000 (11:07 +0100)]
[RefactoredBMS] Refresh in-memory SharedPreferences instances after restore
This CL replicates ag/
2284557 in RefactoredBMS (only the BMS part, the
rest is already live code).
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: I4f6cb85b879e0ee7b2b20ac998977f8c6d8fdfe0
Michal Karpinski [Tue, 19 Sep 2017 09:46:38 +0000 (10:46 +0100)]
[RefactoredBMS] Tear down agent after preflight rejection
This CL replicates ag/
2520584 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: I13ac110dbc197df473dd6a0cf24866133dfefab8
Michal Karpinski [Tue, 19 Sep 2017 09:34:07 +0000 (10:34 +0100)]
[RefactoredBMS] Do not perform backup/restore of instant apps
This CL replicates ag/
2256021 in RefactoredBMS.
Test: runtest -p com.android.server.backup frameworks-services
Bug:
37973765
Change-Id: Icf615b97025aa09681f9d25b1de3f94e60a45ee4
Charles He [Tue, 19 Sep 2017 08:32:46 +0000 (08:32 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99 am:
7e75870d11 am:
a9f6384b6a
am:
27e007a58d
Change-Id: I1c3a3b852bd12a4310f54027b0e893feae2e0d55
Charles He [Tue, 19 Sep 2017 08:25:22 +0000 (08:25 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1 am:
692b55390f am:
01014743c0
am:
551fb6ba84
Change-Id: Id3ac9d9e2a982e9205f4f4a70c1373eed6480844
Charles He [Tue, 19 Sep 2017 08:25:16 +0000 (08:25 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99 am:
7e75870d11
am:
a9f6384b6a
Change-Id: I853f48a75865008ac8b976eec1af56fb1870a1b3
Charles He [Tue, 19 Sep 2017 08:17:12 +0000 (08:17 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1 am:
692b55390f
am:
01014743c0
Change-Id: Ide329f8e32538f4643e727697b35bfc2b7007f57
Charles He [Tue, 19 Sep 2017 08:17:05 +0000 (08:17 +0000)]
Merge changes from topic "vpn-dialog" am:
19bb1a0b99
am:
7e75870d11
Change-Id: Ifb581e7b40d52b2378b347ff62669713be344093
TreeHugger Robot [Tue, 19 Sep 2017 08:14:55 +0000 (08:14 +0000)]
Merge "Translate Android log entries to stats_log proto Test: tested on local device"
Charles He [Tue, 19 Sep 2017 08:09:45 +0000 (08:09 +0000)]
Merge changes from topic "vpn-dialog"
am:
19bb1a0b99
Change-Id: I168072aa2bfdb9ed7630cf50547cb9732fb29280
Charles He [Tue, 19 Sep 2017 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "always-on-vpn" am:
cc15c7f8c1
am:
692b55390f
Change-Id: I3931c053c4daff092b06e3e1d673817708762a62
Charles He [Tue, 19 Sep 2017 08:01:45 +0000 (08:01 +0000)]
Merge changes from topic "always-on-vpn"
am:
cc15c7f8c1
Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
Charles He [Tue, 19 Sep 2017 07:56:44 +0000 (07:56 +0000)]
Merge changes from topic "vpn-dialog"
* changes:
Unbreak VPN unit tests.
Add alert dialog when always-on VPN disconnects.
Charles He [Wed, 16 Aug 2017 12:14:13 +0000 (13:14 +0100)]
Unbreak VPN unit tests.
VpnTest was broken earlier due to a change to always-on VPN
notifications. This CL adds the corresponding mocks to the unit test to
fix it.
Bug:
36650087
Bug:
65439160
Test: runtest frameworks-net
Change-Id: Icff57c7e927c135d75a7d70ff347a579c5d45134
Merged-In: Icff57c7e927c135d75a7d70ff347a579c5d45134
(cherry picked from commit
3da6a1fc82b7e0c7adc88b92e50cceec8173672e)
Charles He [Tue, 19 Sep 2017 07:50:13 +0000 (07:50 +0000)]
Merge changes from topic "always-on-vpn"
* changes:
Opt-out for always-on VPN: rename API.
Opt-out for always-on VPN
Hugo Benichi [Tue, 19 Sep 2017 07:42:18 +0000 (07:42 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab am:
a35bbadeba am:
19625788a1
am:
98177f01f7
Change-Id: I7d57c0f2377f44bcf75e18c80c0306bbfccb9591
Hugo Benichi [Tue, 19 Sep 2017 07:36:12 +0000 (07:36 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab am:
a35bbadeba
am:
19625788a1
Change-Id: I8ca2a01a95acaaca2599563efd6a21e4372d1f95
Hugo Benichi [Tue, 19 Sep 2017 07:29:09 +0000 (07:29 +0000)]
Merge "Wakeup packet events: addressing a few comments" am:
67d16ec1ab
am:
a35bbadeba
Change-Id: I33eeb421cff21efdaa409d27fb130ff4754ac6b0
Hugo Benichi [Tue, 19 Sep 2017 07:21:12 +0000 (07:21 +0000)]
Merge "Wakeup packet events: addressing a few comments"
am:
67d16ec1ab
Change-Id: I67b2e54d45a39005e2091a46e8b90d8cc75fe079
Hugo Benichi [Tue, 19 Sep 2017 07:12:03 +0000 (07:12 +0000)]
Merge "Wakeup packet events: addressing a few comments"
Rubin Xu [Tue, 19 Sep 2017 06:57:14 +0000 (06:57 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2 am:
082234f4aa am:
3db86833e6
am:
1aabcf76ef
Change-Id: Ie928474dc005c713063885d156786106ca2c281c
OSDN Git Service
