OSDN Git Service
Felipe Leme [Mon, 25 Mar 2019 16:52:19 +0000 (09:52 -0700)]
Defined new APIs to whitelist content capture for specific URLs.
Test: m update-api # not implemented yet
Fixes:
129267994
Change-Id: Ibd83368ce79e8dfe901164f921304091c41428fc
TreeHugger Robot [Mon, 25 Mar 2019 18:31:52 +0000 (18:31 +0000)]
Merge "Fix no vibration when typing from time to time"
TreeHugger Robot [Mon, 25 Mar 2019 18:09:18 +0000 (18:09 +0000)]
Merge "Add updated battery saver mode strings"
TreeHugger Robot [Mon, 25 Mar 2019 17:59:36 +0000 (17:59 +0000)]
Merge "Do not reset per package appop modes for permissions"
TreeHugger Robot [Mon, 25 Mar 2019 17:59:28 +0000 (17:59 +0000)]
Merge "Fix testTokenBasedResetPassword."
TreeHugger Robot [Mon, 25 Mar 2019 17:52:10 +0000 (17:52 +0000)]
Merge "Fix camera stress tests directory"
Badhri Jagan Sridharan [Mon, 25 Mar 2019 17:17:18 +0000 (17:17 +0000)]
Merge changes from topic "
128534822"
* changes:
UsbPortManager: Re-enable contaminant detection when port is unplugged
Support contaminant detection disable workflow
Refactor actions that are needed to be taken during port status changes.
Add option to "Enable USB"
Tadashi G. Takaoka [Mon, 25 Mar 2019 17:13:01 +0000 (10:13 -0700)]
[automerger skipped] Merge "Make SelectTest append selectTest argument from extended class" am:
96cf453355 am:
bf2309beae
am:
b7d958b944 -s ours
am skip reason: change_id I83d13d9ef82a92677bee67da5ee8a5faa0690f82 with SHA1
9648d4b04b is in history
Change-Id: I6d32e3b22535b84fa63e2536587d4d7667c5b99c
Tadashi G. Takaoka [Mon, 25 Mar 2019 17:03:35 +0000 (10:03 -0700)]
Merge "Make SelectTest append selectTest argument from extended class" am:
96cf453355
am:
bf2309beae
Change-Id: I068d7b920796ac90f756bfcba6cf51e046ebbff3
Winson Chung [Mon, 25 Mar 2019 16:58:11 +0000 (16:58 +0000)]
Merge changes from topic "nav-bar-mode-fw-overlay"
* changes:
Overlaying the nav bar frame dimens
Check the overlay state for updating sysui
Removing old resources
Remove the swipe up setting from system
Josh Tsuji [Mon, 25 Mar 2019 16:56:27 +0000 (16:56 +0000)]
Merge "Ensure that removing/removed views can't affect chained animations."
Tadashi G. Takaoka [Mon, 25 Mar 2019 16:52:49 +0000 (09:52 -0700)]
Merge "Make SelectTest append selectTest argument from extended class"
am:
96cf453355
Change-Id: I875035648d138f2fbae86ebc1c0f04c8c8dfaa82
TreeHugger Robot [Mon, 25 Mar 2019 16:42:42 +0000 (16:42 +0000)]
Merge "Deprecate is_layer for vulkan functor"
Treehugger Robot [Mon, 25 Mar 2019 16:38:20 +0000 (16:38 +0000)]
Merge "Make SelectTest append selectTest argument from extended class"
Lucas Dupin [Mon, 25 Mar 2019 16:36:27 +0000 (16:36 +0000)]
Merge "Simplify the AttentionService API"
TreeHugger Robot [Mon, 25 Mar 2019 16:13:10 +0000 (16:13 +0000)]
Merge "Make adjustNotification working no matter the notification is just enqueued or already posted"
Christine Franks [Mon, 25 Mar 2019 16:12:16 +0000 (16:12 +0000)]
Merge "Synchronize NightDisplayListener"
Stanislav Zholnin [Mon, 25 Mar 2019 15:59:02 +0000 (15:59 +0000)]
Merge "Add READ_DEVICE_CONFIG permission check to DeviceConfig API."
Ryan Mitchell [Mon, 25 Mar 2019 15:49:14 +0000 (15:49 +0000)]
Merge "Compile all files in res/xml as xml"
Salvador Martinez [Mon, 25 Mar 2019 15:45:46 +0000 (15:45 +0000)]
Merge "Add a generic 'confirm' string for battery saver"
Pavel Grafov [Mon, 25 Mar 2019 15:32:41 +0000 (15:32 +0000)]
Fix testTokenBasedResetPassword.
Bug:
120536847
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Change-Id: Idbd89cf62121cfd08c7509f175bcece984080854
madym [Mon, 25 Mar 2019 15:19:32 +0000 (08:19 -0700)]
Merge "Add to sysui owners" am:
e9e5017afe am:
5a5ec0b4e8
am:
f87b17a481
Change-Id: I53a3610950c7a0b91a8b8ada7ceb14b85ea61b5e
madym [Mon, 25 Mar 2019 15:09:13 +0000 (08:09 -0700)]
Merge "Add to sysui owners" am:
e9e5017afe
am:
5a5ec0b4e8
Change-Id: Ie573d2218aa63d1c6529c4cda98dabfeb64baba5
TreeHugger Robot [Mon, 25 Mar 2019 15:02:11 +0000 (15:02 +0000)]
Merge "Add count to TouchEventReported atom"
madym [Mon, 25 Mar 2019 14:57:46 +0000 (07:57 -0700)]
Merge "Add to sysui owners"
am:
e9e5017afe
Change-Id: Idf2bf55ce705756cd98f21396a21fc0c3b207bf0
Treehugger Robot [Mon, 25 Mar 2019 14:43:37 +0000 (14:43 +0000)]
Merge "Add to sysui owners"
TreeHugger Robot [Mon, 25 Mar 2019 14:18:12 +0000 (14:18 +0000)]
Merge "Make SelectTest append selectTest argument from extended class"
Christine Franks [Mon, 25 Mar 2019 14:11:44 +0000 (14:11 +0000)]
Merge "Split global saturation into a dedicated helper"
Ricky Wai [Mon, 25 Mar 2019 14:10:22 +0000 (14:10 +0000)]
Merge "Suppress injected launcher activity for apps without any permissions or any components"
Andrei-Valentin Onea [Mon, 25 Mar 2019 13:57:20 +0000 (13:57 +0000)]
Merge changes from topic "android-internal-srcs"
* changes:
Add @UnsupportedAppUsage annotations
Add android internal dirs to hiddenapi-mappings
Android Build Merger (Role) [Mon, 25 Mar 2019 13:57:12 +0000 (13:57 +0000)]
Merge "Merge "Add nullability annotations" am:
a1ee1fc888 am:
3d48153a8f am:
b141a800ac"
Remi NGUYEN VAN [Mon, 25 Mar 2019 13:56:43 +0000 (06:56 -0700)]
Merge "Add nullability annotations" am:
a1ee1fc888 am:
3d48153a8f
am:
b141a800ac
Change-Id: I43088399da1d81556ab903ef1ca716439129f00d
Roshan Pius [Mon, 25 Mar 2019 13:56:27 +0000 (13:56 +0000)]
Merge "Revert "WifiConfiguration: Add a new temp blacklist reason for disconnect""
Tony Mak [Fri, 22 Mar 2019 11:31:35 +0000 (11:31 +0000)]
Make adjustNotification working no matter the notification is just
enqueued or already posted
BUG:
129042820
Test: atest frameworks/base/packages/ExtServices/tests/src/android/ext/services/notification/
Change-Id: I5df96b0e971e9b037b3efa9204c3fad3bfcf1081
Mark Chien [Mon, 25 Mar 2019 13:44:17 +0000 (06:44 -0700)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value" am:
6aef2afd4e am:
37dd29a169
am:
71f6e5b794
Change-Id: I80c56a14a0be2e6b7996f2bcb9a1a320f0c2c058
Remi NGUYEN VAN [Mon, 25 Mar 2019 13:42:49 +0000 (06:42 -0700)]
Merge "Add nullability annotations" am:
a1ee1fc888
am:
3d48153a8f
Change-Id: Ic81850c2976e7412e85856c5d1336f30d0691125
Mark Chien [Mon, 25 Mar 2019 13:34:45 +0000 (06:34 -0700)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value" am:
6aef2afd4e
am:
37dd29a169
Change-Id: I0de6ff4a97f64b0ba72856c9d9d6fe57d677e5fa
Bo Liu [Sun, 24 Mar 2019 12:26:11 +0000 (08:26 -0400)]
Deprecate is_layer for vulkan functor
Webview no longer needs this.
Bug:
124123583
Test: comppiles and vulkan webview in layer keeps working
Change-Id: Ib54e33649eb027a03184c5d7588cfd9568c90a6c
Remi NGUYEN VAN [Mon, 25 Mar 2019 13:33:40 +0000 (06:33 -0700)]
Merge "Add nullability annotations"
am:
a1ee1fc888
Change-Id: I47ec92d406b16eaff049ad4a5af1b1b407418e4d
Mark Chien [Mon, 25 Mar 2019 13:25:42 +0000 (06:25 -0700)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value"
am:
6aef2afd4e
Change-Id: I8c5993aadd1bfa79290821215f6dae2bba057c5f
Treehugger Robot [Mon, 25 Mar 2019 13:19:19 +0000 (13:19 +0000)]
Merge "Add nullability annotations"
Tadashi G. Takaoka [Fri, 22 Mar 2019 08:21:51 +0000 (17:21 +0900)]
Make SelectTest append selectTest argument from extended class
This CL also moves CoreTestsFilter to frameworks/base/tests/utils, so
that FrameworksCoreTests, FrameworksServicesTests, and WmTests can use
CoreTestsFilter.
Test: Pass SelectTestTests
$ atest WmTests:com.android.test.filters.SelectTestTests
Test: Pass all 85 WM related non-flaky presubmit tests in FrameworksCoreTests
using CoreTestsFilter
$ tradefed.sh run commandAndExit FrameworksCoreTests \
--instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
--instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 293 WM related non-flaky presubmit tests in
FrameworksServicesTests using CoreTestsFilter
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg selectTest=com.android.server.wm.,com.android.server.am. \
--instrumentation-arg filter=com.android.server.wm.test.filters.CoreTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Bug:
122451194
Change-Id: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
Merged-In: I83d13d9ef82a92677bee67da5ee8a5faa0690f82
Mark Chien [Mon, 25 Mar 2019 13:10:17 +0000 (13:10 +0000)]
Merge "[TCPKeepalive] Fill correct TOS and TTL value"
Antoan Angelov [Mon, 25 Mar 2019 12:53:43 +0000 (12:53 +0000)]
Merge "Remove PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE"
TreeHugger Robot [Mon, 25 Mar 2019 12:02:27 +0000 (12:02 +0000)]
Merge "Fix UI incorrect when switch active device to hearing aid"
Junyu Lai [Mon, 25 Mar 2019 11:16:18 +0000 (04:16 -0700)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am:
8324c3e7e5 am:
08e1787088
am:
d24f3fc8b1
Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be
Stanislav Zholnin [Fri, 8 Mar 2019 14:54:55 +0000 (14:54 +0000)]
Add READ_DEVICE_CONFIG permission check to DeviceConfig API.
Test: atest FrameworksCoreTests:DeviceConfigTest
atest FrameworksCoreTests:SettingsProviderTest
atest SettingsProviderTest:DeviceConfigServiceTest
Bug:
117663715
Change-Id: I04226876ddf910945bf343d25fa3dd04ba8eab31
Junyu Lai [Mon, 25 Mar 2019 11:06:39 +0000 (04:06 -0700)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am:
8324c3e7e5
am:
08e1787088
Change-Id: Iead39e877aec917ff3c409fda1ff0c4dbaa21fcb
Remi NGUYEN VAN [Mon, 25 Mar 2019 11:00:04 +0000 (04:00 -0700)]
[automerger skipped] Merge "Add nullable annotations to startActivityAsUser" am:
743a4b7872 am:
2704d2f4f6
am:
f6ae002aba -s ours
am skip reason: change_id I9b61d833a68528f168611c83a8539eb095a42e01 with SHA1
ebc927c382 is in history
Change-Id: Ic706a6f014ef498bbc3776bea4168929cd7a2e90
Junyu Lai [Mon, 25 Mar 2019 10:57:32 +0000 (03:57 -0700)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
am:
8324c3e7e5
Change-Id: Id82be12a54e676c4ad18900ae910e6d08079e62c
Remi NGUYEN VAN [Mon, 25 Mar 2019 10:50:40 +0000 (03:50 -0700)]
Merge "Add nullable annotations to startActivityAsUser" am:
743a4b7872
am:
2704d2f4f6
Change-Id: I9f52f733b219acaae437c452bc238f6933bb0cec
Junyu Lai [Mon, 25 Mar 2019 10:42:37 +0000 (10:42 +0000)]
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
Remi NGUYEN VAN [Mon, 25 Mar 2019 10:41:34 +0000 (03:41 -0700)]
Merge "Add nullable annotations to startActivityAsUser"
am:
743a4b7872
Change-Id: Ifa44f448fd37ecc2051a16d979717b8aeaa05ebf
Treehugger Robot [Mon, 25 Mar 2019 10:29:22 +0000 (10:29 +0000)]
Merge "Add nullable annotations to startActivityAsUser"
Stanislav Zholnin [Mon, 25 Mar 2019 10:03:55 +0000 (10:03 +0000)]
Merge "Use updated DeviceConfig API's new getters to simplify invocations."
Abhijeet Kaur [Mon, 25 Mar 2019 09:19:36 +0000 (02:19 -0700)]
[automerger skipped] Merge "Add Looper.prepare() to doInBackground()" am:
89bf100d66 am:
f43399621c
am:
a81998046f -s ours
am skip reason: change_id I6a5ea594d95462e1c66bd28eb81dd5f4daa6f35e with SHA1
b7a6549654 is in history
Change-Id: I21797061afe23781d10eb290dcb4d098feba5b75
Nandana Dutt [Mon, 25 Mar 2019 09:11:51 +0000 (02:11 -0700)]
Merge "Stop bugreportd if binder call fails" am:
8cf74c36c0 am:
e42a405ee8
am:
c9652eedf7
Change-Id: I440a1e06ee5cff4fb6054dbe42a68f2fb46b9efb
Abhijeet Kaur [Mon, 25 Mar 2019 09:10:20 +0000 (02:10 -0700)]
Merge "Add Looper.prepare() to doInBackground()" am:
89bf100d66
am:
f43399621c
Change-Id: I59b50ca26bd710511a109451f1b5e6ed3759a03f
Nandana Dutt [Mon, 25 Mar 2019 09:02:15 +0000 (02:02 -0700)]
Merge "Stop bugreportd if binder call fails" am:
8cf74c36c0
am:
e42a405ee8
Change-Id: Id5c8e509341359ecb4f4f3e82909eb2fee581f9d
Abhijeet Kaur [Mon, 25 Mar 2019 09:01:16 +0000 (02:01 -0700)]
Merge "Add Looper.prepare() to doInBackground()"
am:
89bf100d66
Change-Id: Ia030ffbf4913d1f04f0f007a9947186d107038cc
Nandana Dutt [Mon, 25 Mar 2019 08:53:34 +0000 (01:53 -0700)]
Merge "Stop bugreportd if binder call fails"
am:
8cf74c36c0
Change-Id: Ife5c3c7090423b084b829c16f1d7d4a931c1936e
Treehugger Robot [Mon, 25 Mar 2019 08:48:03 +0000 (08:48 +0000)]
Merge "Add Looper.prepare() to doInBackground()"
Nandana Dutt [Mon, 25 Mar 2019 08:43:43 +0000 (08:43 +0000)]
Merge "Stop bugreportd if binder call fails"
Remi NGUYEN VAN [Mon, 25 Mar 2019 08:11:17 +0000 (01:11 -0700)]
Merge "Compile NetworkStack resources only once" am:
963136ce56 am:
4aea56297c
am:
b4c9d697f5
Change-Id: Ibbe585e2dd8c9df6ef99cf1aacfb899331f70a80
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:59:27 +0000 (16:59 +0900)]
Add nullable annotations to startActivityAsUser
This change is already in internal branches.
Test: m
Bug:
128935825
Change-Id: I6f6c939c26215fbc113a6edafbdf865d365c9105
Merged-In: I9b61d833a68528f168611c83a8539eb095a42e01
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:58:04 +0000 (00:58 -0700)]
Merge "Compile NetworkStack resources only once" am:
963136ce56
am:
4aea56297c
Change-Id: I3b24d5f07c2b72a761431c836fcc6ff841316043
junyulai [Mon, 4 Mar 2019 14:45:36 +0000 (22:45 +0800)]
Fix SocketKeepalive APIs which do not meet API review requirement
Per API review, change the use of FileDescriptor to
ParcelFileDescriptor.
This change also fix nullability according to API review
feedbacks.
Fix:
126698610
Fix:
126699425
Fix:
126699232
Fix:
126700278
Test: 1. m -j
2. atest FrameworksNetTests --generate-new-metrics 50
3. m -j doc-comment-check-docs
Change-Id: I19476c50dd1ca290bf3f41973829da2bd229796a
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:48:59 +0000 (00:48 -0700)]
Merge "Compile NetworkStack resources only once"
am:
963136ce56
Change-Id: Ide163cd6cd5da7050a7b4faf123433dd4103e0e7
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:41:08 +0000 (16:41 +0900)]
Add nullability annotations
Add nullability annotations on the following methods:
- StaticIpConfiguration#getRoutes
- ValidationProbeEvent#getProbeName
Test: m
Bug:
128935825
Change-Id: I1c17d200f3125e684c4e4d67b2f7f079eda310b6
Remi NGUYEN VAN [Mon, 25 Mar 2019 07:40:33 +0000 (07:40 +0000)]
Merge "Compile NetworkStack resources only once"
TreeHugger Robot [Mon, 25 Mar 2019 05:56:29 +0000 (05:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Mar 2019 05:46:50 +0000 (22:46 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
1b82db4c3e -s ours
am:
11f4cbcbd7 -s ours
am skip reason: subject contains skip directive
Change-Id: If5ea9e81018a417e12275412e04486b8598c5d42
Bill Yi [Mon, 25 Mar 2019 05:42:50 +0000 (22:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
1b82db4c3e -s ours
am skip reason: subject contains skip directive
Change-Id: I384ffeca242db2036570b03af78fb981a6573505
Arthur Hung [Tue, 19 Mar 2019 06:28:15 +0000 (14:28 +0800)]
Fix no vibration when typing from time to time
VibratorService would ignore the vibration request by checking
if the uid state is in background from cache.
But the cache updating from UidObserver would be handled after
service connected and responded.
That would cause some time gap to check if the process
is in foreground.
- Change to the full update when bindService that guarantees
the UidObserver is called in time.
Test: atest AppComponentFactoryTest
Test: atest VibratorTest
Test: Change software keyboard between different windows.
Bug:
121436339
Change-Id: If260dc19e1a32c9dbb58c8ce960f295c6c919406
Mark Chien [Mon, 25 Mar 2019 04:19:35 +0000 (21:19 -0700)]
Merge "Fix the race between carrier config and DDS change" am:
36538bb38c am:
514010fc25
am:
594ee80cb1
Change-Id: Ie45c9b2ccb986ec92d4efbe99e9682e01304c28c
Mark Chien [Mon, 25 Mar 2019 04:10:21 +0000 (21:10 -0700)]
Merge "Fix the race between carrier config and DDS change" am:
36538bb38c
am:
514010fc25
Change-Id: I16c87cb11e92ec2267dfa66c7da2904aa05e3644
Mark Chien [Mon, 25 Mar 2019 03:58:46 +0000 (20:58 -0700)]
Merge "Fix the race between carrier config and DDS change"
am:
36538bb38c
Change-Id: Idf1e5c33560845095028127d6bc3f384471bd4a1
Mark Chien [Mon, 25 Mar 2019 03:48:02 +0000 (03:48 +0000)]
Merge "Fix the race between carrier config and DDS change"
TreeHugger Robot [Mon, 25 Mar 2019 03:43:22 +0000 (03:43 +0000)]
Merge "Make sure to report wait result when clean up activities"
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:23:39 +0000 (20:23 -0700)]
Merge "Separate NetworkMonitor/framework portal URL" am:
bcd3bed561 am:
34198fac89
am:
4d975feb9f
Change-Id: I85e744d94d96ecf9ac558e62016418d8199bb98c
markchien [Thu, 21 Mar 2019 14:26:54 +0000 (22:26 +0800)]
[TCPKeepalive] Fill correct TOS and TTL value
Fill correct TOS/TTL value by fetching them from kernel with
getsockopt.
bug:
123967966
Test: -build, flash, boot
-atest FrameworksNetTests
Change-Id: I75b1be51040b4a381163958b4cddd27dbb22bac1
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:11:49 +0000 (20:11 -0700)]
Merge "Separate NetworkMonitor/framework portal URL" am:
bcd3bed561
am:
34198fac89
Change-Id: Ic6c16ccf98e943b7003524f6e2b98e100e543221
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:10:38 +0000 (20:10 -0700)]
[automerger skipped] Merge "Fix API in CaptivePortal and ConnectivityManager" am:
3c959339ae am:
79f2cf93d2
am:
cd08ecfdfd -s ours
am skip reason: change_id I09545c00af3519dbf141dd5951b28f49e37b3e80 with SHA1
24ec3ff006 is in history
Change-Id: I793a60492ba7b63c6dea2937e7fc651a1ab617b9
TreeHugger Robot [Mon, 25 Mar 2019 03:04:20 +0000 (03:04 +0000)]
Merge changes I14c90b6a,I7850a556
* changes:
Reset configuration of invisible size-compat activity if display changes
Don't involve decor inset into app bounds of fixed aspect ratio app
Remi NGUYEN VAN [Mon, 25 Mar 2019 03:02:39 +0000 (20:02 -0700)]
Merge "Separate NetworkMonitor/framework portal URL"
am:
bcd3bed561
Change-Id: I1926527f7875e459b4d3c84bfcd8b3aac9562cae
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:57:01 +0000 (19:57 -0700)]
Merge "Fix API in CaptivePortal and ConnectivityManager" am:
3c959339ae
am:
79f2cf93d2
Change-Id: Ibe9d16bbf1e794eb05166ad9c6bccb3ad5bcae9d
Remi NGUYEN VAN [Wed, 20 Mar 2019 07:40:54 +0000 (16:40 +0900)]
Compile NetworkStack resources only once
The current build files would compile resources both for the
android_library and the android_app build rules, since the android_app
build rule resource_dirs default to ["res"]. Set resource_dirs to [] for
these build rules so that resources are only inherited from the
android_library.
Also refactor the build file using java_defaults to avoid repeating
configuration.
Test: flashed, boots, WiFi working
Bug:
127908503
Change-Id: Ie51dd1bd1a8ee5145e3f1b95beb1de59665b4c51
Chiachang Wang [Mon, 25 Mar 2019 02:54:29 +0000 (19:54 -0700)]
[automerger skipped] Merge "Add network stack proto" am:
727f8bbfc6 am:
2fa14ae4c0
am:
16dd607022 -s ours
am skip reason: change_id Iec48037771f2729fcbf741eb1c16edf08dbc70a4 with SHA1
0e88ebfb28 is in history
Change-Id: I46f43baf167e92ea8353d2fd17530909ee7f6c62
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:50:37 +0000 (02:50 +0000)]
Merge "Separate NetworkMonitor/framework portal URL"
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:46:32 +0000 (19:46 -0700)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
am:
3c959339ae
Change-Id: I4cc3c61232c74bafe4eb549c1aba5de20a8bb3ff
Calvin Pan [Mon, 25 Mar 2019 02:41:19 +0000 (19:41 -0700)]
Merge "Marked nullable in setter argument" am:
f5bc344375 am:
2f0ad7bfd6
am:
20fff460f6
Change-Id: I189e229115a2106a7a9826f4109f0194d2b1f061
Treehugger Robot [Mon, 25 Mar 2019 02:37:28 +0000 (02:37 +0000)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
Chiachang Wang [Mon, 25 Mar 2019 02:36:45 +0000 (19:36 -0700)]
Merge "Add network stack proto" am:
727f8bbfc6
am:
2fa14ae4c0
Change-Id: Ia82ff368e705150015be6f9dad8c1f93fa9ec8c7
Calvin Pan [Mon, 25 Mar 2019 02:31:38 +0000 (19:31 -0700)]
Merge "Marked nullable in setter argument" am:
f5bc344375
am:
2f0ad7bfd6
Change-Id: I02525e27fd9b4da474ff15bf502c49626ba079d2
Chiachang Wang [Mon, 25 Mar 2019 02:26:32 +0000 (19:26 -0700)]
Merge "Add network stack proto"
am:
727f8bbfc6
Change-Id: Ic01456c0860e6435f26b1af48359096db6b63224
Calvin Pan [Mon, 25 Mar 2019 02:17:45 +0000 (19:17 -0700)]
Merge "Marked nullable in setter argument"
am:
f5bc344375
Change-Id: I6eb379b487e85e4523227938a1f1c281b6b1a8ce
Chiachang Wang [Mon, 25 Mar 2019 02:16:16 +0000 (02:16 +0000)]
Merge "Add network stack proto"
Remi NGUYEN VAN [Mon, 25 Mar 2019 02:08:46 +0000 (19:08 -0700)]
Merge "Refactor DhcpErrorEvent error codes" am:
ed2e54a521 am:
150a395303
am:
78c80c1098
Change-Id: Icfc48ac2ac899a25836e142b5c22dae51fd1752f
Calvin Pan [Mon, 25 Mar 2019 02:01:52 +0000 (02:01 +0000)]
Merge "Marked nullable in setter argument"
Louis Chang [Wed, 20 Mar 2019 09:17:22 +0000 (17:17 +0800)]
Make sure to report wait result when clean up activities
Starting activity with ‘-W’ option from shell waited forever
because activity was brought to top, but being removed from
waiting visible activities (due to process was gone) without
reporting the wait result.
Also correcting the component to avoid waiting for a top
finishing activity.
Bug:
117579987
Test: atest ActivityManagerAmStartOptionsTests
Change-Id: I7c1e6781544f0d794225a13fdf417475ff0598a3