OSDN Git Service
Beverly [Wed, 20 Sep 2017 16:07:47 +0000 (16:07 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev
am:
8e84dfec6a
Change-Id: I779fde484505f8fd6e5a19397b670299970320c9
TreeHugger Robot [Wed, 20 Sep 2017 16:02:46 +0000 (16:02 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 15:44:32 +0000 (15:44 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
am:
36e5c8e7ed
Change-Id: Ib1ee3dae5b5b25a2ebdf1fea21d080cfbf506af2
Neil Fuller [Wed, 20 Sep 2017 15:39:37 +0000 (15:39 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master am:
8acdb8aa65
am:
93fcfbc8cb -s ours
Change-Id: I5eb5f54262cbcb38095ff5a6092c200c839e6987
Neil Fuller [Wed, 20 Sep 2017 15:36:47 +0000 (15:36 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
Rubin Xu [Wed, 20 Sep 2017 15:28:29 +0000 (15:28 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
am:
223a65f3f5
Change-Id: I3bba8e337fe57999daf1e7d8ff90a9f7bfc6831d
Rubin Xu [Wed, 20 Sep 2017 15:15:42 +0000 (15:15 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 14:55:08 +0000 (14:55 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master
am:
8acdb8aa65
Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4
Alan Viverette [Wed, 20 Sep 2017 14:09:01 +0000 (14:09 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
am:
286c7db342
Change-Id: I82092817d26af0a372923d238b9f84112f196ad2
TreeHugger Robot [Wed, 20 Sep 2017 13:59:05 +0000 (13:59 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 12:43:28 +0000 (13:43 +0100)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3dc2e0b10bbf5be9c7d8f98b03cf8030bbfff07
Treehugger Robot [Wed, 20 Sep 2017 12:08:58 +0000 (12:08 +0000)]
Merge "Fix reliability triggering"
Victor Chang [Wed, 20 Sep 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp
Karthik Ravi Shankar [Wed, 20 Sep 2017 03:28:32 +0000 (03:28 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev
am:
7a59a62276
Change-Id: Ic4726a77ce790616d50ff84edc35e7941b409659
Shubham Ajmera [Wed, 20 Sep 2017 03:18:33 +0000 (03:18 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
am:
2cdfda1232
Change-Id: If3060eb7b21a3bb5f6b34b36de012cb35e4f03c9
TreeHugger Robot [Wed, 20 Sep 2017 03:17:44 +0000 (03:17 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 03:11:22 +0000 (03:11 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
Sungsoo Lim [Wed, 20 Sep 2017 03:02:28 +0000 (03:02 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev
am:
d4aee713d4
Change-Id: Ifa91341cb48c970f9b19c6f8bc0219c1a3372a9a
TreeHugger Robot [Wed, 20 Sep 2017 02:54:45 +0000 (02:54 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev
Hugo Benichi [Wed, 20 Sep 2017 01:05:15 +0000 (01:05 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
am:
14676c5da4
Change-Id: I34613d4e53c6cc33029e1f8030b0605100cc59fc
Hugo Benichi [Wed, 20 Sep 2017 00:58:35 +0000 (00:58 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
* changes:
Wakeup packet events: addressing a few comments
Connectivity metrics: add WakeupStats events
Connectivity metrics: collect NFLOG wakeup events
Christine Franks [Wed, 20 Sep 2017 00:43:12 +0000 (00:43 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
am:
1276f357d3
Change-Id: I96cc0161eb092f2a965efbff4a417bc992493625
Felipe Leme [Wed, 20 Sep 2017 00:33:23 +0000 (00:33 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
am:
5488a38465
Change-Id: I40b5124559da062bad0bdb9405aa89ef10d12597
Android Build Merger (Role) [Wed, 20 Sep 2017 00:23:32 +0000 (00:23 +0000)]
Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am:
9282193c84" into oc-mr1-dev-plus-aosp
Christine Franks [Wed, 20 Sep 2017 00:23:28 +0000 (00:23 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
David Stevens [Wed, 20 Sep 2017 00:18:26 +0000 (00:18 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am:
9282193c84
Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94
Jordan Liu [Wed, 20 Sep 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7 am:
649f3bf73f
am:
56ed1f9c9d
Change-Id: I039843725244d892248591cf4e88e1840e506733
David Stevens [Wed, 20 Sep 2017 00:09:04 +0000 (00:09 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
Jordan Liu [Wed, 20 Sep 2017 00:04:56 +0000 (00:04 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7
am:
649f3bf73f
Change-Id: If8b12685886ccbdecdb4e123629edc4e3426711d
Jordan Liu [Tue, 19 Sep 2017 23:55:48 +0000 (23:55 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
am:
c8ad4a82c7
Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17
Jordan Liu [Tue, 19 Sep 2017 23:39:42 +0000 (23:39 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
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: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: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: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
Shubham Ajmera [Tue, 19 Sep 2017 21:07:05 +0000 (14:07 -0700)]
Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d
We have already reverted A/B dexopt for secondary dex files in commit
7c1471197427b59f99578fd2483b1e113ba4b7f1. This removes secondary dex
opt during boot after OTA.
Bug:
65067046
Test: make and boot.
Change-Id: I76009ed609a608e009a50860b53a8dfed9d57334
Christine Franks [Fri, 25 Aug 2017 20:57:26 +0000 (13:57 -0700)]
Handle night display state when timezone changes
Bug:
64458884
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services and manually tested Hawaii and London
Change-Id: I052034a4c64eb73c42672215e8847c11e00efeb5
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
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
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
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
Beverly [Tue, 19 Sep 2017 18:56:58 +0000 (14:56 -0400)]
DND alert info set to INVISIBLE (not GONE) to retain formatting.
Change-Id: I182aed5f48d4c2a935a7bfbb9a240046b27dea58
Fixes:
64688590
Test: Manual based on repro steps
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
Victor Chang [Fri, 11 Aug 2017 16:17:16 +0000 (17:17 +0100)]
Remove StructGroupSourceReq
- Remove the class as part of removing setsockoptGroupSourceReq from
Os.java
- CtsLibcoreTestCases and CtsLibcoreOjTestCases pass on aosp/master
Bug:
32071916
Test: m
Change-Id: I132190f47cea9f56ec56a824763f7e2b2cfde893
Fyodor Kupolov [Tue, 19 Sep 2017 18:29:14 +0000 (18:29 +0000)]
Merge "Fix AddAccountSettings memory leak"
David Stevens [Thu, 24 Aug 2017 01:41:49 +0000 (18:41 -0700)]
Handle showWhenLocked on secondary displays
The keyguard has windows on the default display and the remote display
selected by MediaRouter. Keyguard occlusion only applies to the default
display. To make the activity showWhenLocked flag work on secondary
displays, pass the display id of the locked secondary display from the
SystemUi to KeyguardController and make its isKeyguardShowing method
take a displayId.
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testSecondaryDisplayShowWhenLocked
Bug:
64994006
Merged-In: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
Change-Id: Ib31fc76e9df469e97a59a181f09d457ceed4ef5f
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
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
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."
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
Merged-In: Ibb2c537955d09a5d538c50490dae94a518522f19
(cherry picked from commit
cd1a109b872f58f5baa0ce8438bf3ddd69eec9fc)
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
Merged-In: Ibb2c537955d09a5d538c50490dae94a518522f19
(cherry picked from commit
cd1a109b872f58f5baa0ce8438bf3ddd69eec9fc)
Rubin Xu [Tue, 19 Sep 2017 14:27:21 +0000 (15:27 +0100)]
Fail gracefully if password reset token is invalidated
This can happen if the user went through an untrusted credential reset,
which causes it's synthetic password to change. In this case fail gracefully.
Bug:
65912645
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testResetPasswordWithToken
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testResetPasswordTokenUsableAfterClearingLock
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testResetPasswordWithTokenBeforeUnlock
Change-Id: I2f2fc4fbaa97cde6f4c1997e27aa5087b0a42b19
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
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."
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
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: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 04:15:26 +0000 (13:15 +0900)]
Wakeup packet events: addressing a few comments
This patch addresses a few post-submit comment for
commits
f562ac34a51dc and
60c9f63b66921.
Bug:
34901696
Bug:
62179647
Test: runtest frameworks-net
Merged-In: I4abec57e0c6bc869dc57b5eb54582dd977b64c30
(cherry picked from commit
175b574e27daa0d8832b8cc9615a15fce998309a)
Change-Id: Ied9d0cec98685e5a91ed2ca2c81ad88d7ae8d751
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:51:07 +0000 (06:51 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2 am:
082234f4aa
am:
3db86833e6
Change-Id: I72b0ca1b9b50dacb7067eb6ca12ca48a072b5d26
Rubin Xu [Tue, 19 Sep 2017 06:45:04 +0000 (06:45 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am:
430d8472b2
am:
082234f4aa
Change-Id: Iedfbc9a6505611d1a30c348ab15f4fb5b62238eb
Rubin Xu [Tue, 19 Sep 2017 06:37:40 +0000 (06:37 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
am:
430d8472b2
Change-Id: If87f8c43371ee1f5e2e893232c9e340a1a7339f4
Treehugger Robot [Tue, 19 Sep 2017 06:28:21 +0000 (06:28 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
Hugo Benichi [Tue, 19 Sep 2017 04:15:26 +0000 (13:15 +0900)]
Wakeup packet events: addressing a few comments
This patch addresses a few post-submit comment for
commits
f562ac34a51dc and
60c9f63b66921.
Bug:
34901696
Bug:
62179647
Test: runtest frameworks-net
Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30
Steven Moreland [Tue, 19 Sep 2017 03:35:00 +0000 (03:35 +0000)]
Merge "Remove unused variable from screencap." am:
376234fc74 am:
32bdb1e9b0
am:
0fcb7719e0
Change-Id: I6aebd6df0bf9734e1567db31d31bfe85609cbb48