OSDN Git Service
Varun Anand [Fri, 29 Mar 2019 01:06:12 +0000 (18:06 -0700)]
Merge changes from topic "vpn_data_accounting"
am:
6c93e5378a
Change-Id: Iaa4b2dd9be2fc6e9833c6c846b6858aab507ca8b
Varun Anand [Fri, 29 Mar 2019 00:40:53 +0000 (00:40 +0000)]
Merge changes from topic "vpn_data_accounting"
* changes:
Move BatteryStats and StatsCompanionService to use NetworkStatsService.
NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
Take all VPN underlying networks into account when migrating traffic for VPN uid.
markchien [Thu, 28 Mar 2019 23:45:07 +0000 (16:45 -0700)]
Merge "Close tethering when UI entitlement fails"
am:
c3b3a5fa2e
Change-Id: I22ee932f2a9250f11e8bc9e27c03b86884440603
Treehugger Robot [Thu, 28 Mar 2019 23:34:34 +0000 (23:34 +0000)]
Merge "Close tethering when UI entitlement fails"
Hans Boehm [Thu, 28 Mar 2019 22:39:43 +0000 (15:39 -0700)]
Merge "Clarify hasSelection description"
am:
6bd5cf2bcc
Change-Id: Ia7f3d0eae07f978ad29a7f3e127f1bf71c14c8dc
Sooraj Sasindran [Thu, 28 Mar 2019 22:23:30 +0000 (15:23 -0700)]
Merge "Change Values for Opportunistic Entry & Exit Thresholds"
am:
6d565c7785
Change-Id: I1237860b109ba3ff7f0a3abfe406ac32e734fd0a
Hans Boehm [Thu, 28 Mar 2019 22:21:00 +0000 (22:21 +0000)]
Merge "Clarify hasSelection description"
Sooraj Sasindran [Thu, 28 Mar 2019 22:13:37 +0000 (22:13 +0000)]
Merge "Change Values for Opportunistic Entry & Exit Thresholds"
Evan Tyra [Wed, 27 Mar 2019 22:11:15 +0000 (15:11 -0700)]
Change Values for Opportunistic Entry & Exit Thresholds
Due to the generally higher quality of these networks, we expanded the
entry and exit criteria of opportunistic networks.
Test: Make
Change-Id: Iaac1641db1d6a07bcce6dd194765c79c83a92070
Merged-In: Iaac1641db1d6a07bcce6dd194765c79c83a92070
KOUSHIK PANUGANTI [Thu, 28 Mar 2019 20:22:22 +0000 (13:22 -0700)]
Merge "Migrate frameworks/base/packages/Shell to androidx.test"
am:
fae40404f7
Change-Id: Icc87997f68dcc8256fec71d213ea754d8bd8c729
Treehugger Robot [Thu, 28 Mar 2019 19:56:53 +0000 (19:56 +0000)]
Merge "Migrate frameworks/base/packages/Shell to androidx.test"
Yifan Hong [Thu, 28 Mar 2019 18:52:11 +0000 (11:52 -0700)]
Merge "Shutdown device gracefully when net discharging"
am:
8b4b218886
Change-Id: I360b08a8df83570187aad8d7b92d6b5b333c0fee
Treehugger Robot [Thu, 28 Mar 2019 18:34:28 +0000 (18:34 +0000)]
Merge "Shutdown device gracefully when net discharging"
Jayachandran Chinnakkannu [Thu, 28 Mar 2019 18:20:18 +0000 (11:20 -0700)]
Merge "Revert "improve mism support for phonestatelistner""
am:
6eab01bf59
Change-Id: I4c54c362aedaf680fd59a10cf4d792910ba8a04c
Xiangyu/Malcolm Chen [Thu, 28 Mar 2019 18:10:36 +0000 (11:10 -0700)]
Merge changes from topic "
126637721"
am:
9763d788ef
Change-Id: Ia1b93ffad154d8e149d172dd7694b4c58add03a9
Jayachandran Chinnakkannu [Thu, 28 Mar 2019 18:05:53 +0000 (18:05 +0000)]
Merge "Revert "improve mism support for phonestatelistner""
felkachang [Thu, 28 Mar 2019 17:55:26 +0000 (10:55 -0700)]
Merge "To add the Android.bp of ExternalStorageProvider"
am:
6569dd8c24
Change-Id: I4cb30701103cf77a25d7d127765dc8f58ade463b
Xiangyu/Malcolm Chen [Thu, 28 Mar 2019 17:54:14 +0000 (17:54 +0000)]
Merge changes from topic "
126637721"
* changes:
Show signal strength of current active subscription
Update document of setSubscriptionEnabled public API.
Clean up shouldHideSubscription API
Varun Anand [Fri, 25 Jan 2019 02:03:00 +0000 (18:03 -0800)]
Move BatteryStats and StatsCompanionService to use NetworkStatsService.
This CL is a manual merge of http://ag/c/
6015966/3.
Bug:
113122541
Bug:
120145746
Test: atest FrameworksNetTests
Test: manual test: verified that BatteryStats are correctly accounting
for VPN traffic.
Change-Id: I5b07ce70ac58bdcbebc3114bfe9fd411469d57af
Merged-In: I230c1edbf64cfeb3dbb560db368b5e420f7b79a4
Varun Anand [Sat, 19 Jan 2019 03:22:48 +0000 (19:22 -0800)]
NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
This API is similar to one provided by NetworkStatsFactory with the
difference that NSS also migrates traffic from VPN UID to other apps.
Since traffic can only be migrated over NetworkStats delta, NSS
therefore maintains NetworkStats snapshot across all UIDs/ifaces/tags.
This snapshot gets updated whenever NSS records a new snapshot
(based on various hooks such as VPN updating its underlying networks,
network getting lost, etc.), or getDetailedUidStats API is invoked by
one of its callers.
Bug:
113122541
Bug:
120145746
Test: atest FrameworksNetTests
Test: manually verified that battery stats are migrating traffic off of
TUN (after patching above CL where we point BatteryStats to use this
API).
Change-Id: Ib0f0c2d4d41ee1d7a027ea9da457baaf198d649e
Varun Anand [Mon, 18 Feb 2019 07:43:25 +0000 (23:43 -0800)]
Take all VPN underlying networks into account when migrating traffic for
VPN uid.
Bug:
113122541
Bug:
120145746
Test: atest FrameworksNetTests
Test: Manually verified on device that stats from VPN UID are moved
appropriately based on its declared underlying network set.
Test: vogar --mode app_process --benchmark NetworkStatsBenchmark.java
Change-Id: I9d8d0cc58d18002c1c96f8ddff780ef8dc452d21
Treehugger Robot [Thu, 28 Mar 2019 17:31:14 +0000 (17:31 +0000)]
Merge "To add the Android.bp of ExternalStorageProvider"
Jayachandran Chinnakkannu [Thu, 28 Mar 2019 16:31:19 +0000 (16:31 +0000)]
Revert "improve mism support for phonestatelistner"
This reverts commit
2506ceb71e1535af49fd3495f8eae0bbdfe36c5b.
Reason for revert: DSDS system UI issues (b/
129426477)
Change-Id: Ic0fde0d3bd412868917cdbe74504c3f9cebdc712
Mark Chien [Thu, 28 Mar 2019 10:12:28 +0000 (03:12 -0700)]
Merge "Only apply entitlement check to cellular upstream"
am:
eea398a690
Change-Id: Ia9c0ad34c388fb3fb70f7ac1c572d4c1a95a36b2
Mark Chien [Thu, 28 Mar 2019 09:52:52 +0000 (09:52 +0000)]
Merge "Only apply entitlement check to cellular upstream"
Nicolas Geoffray [Thu, 28 Mar 2019 09:39:21 +0000 (02:39 -0700)]
Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""
am:
d08c3b655b
Change-Id: Id04898d99862cc1fff248fc9ba466faf55e30eb7
Nicolas Geoffray [Thu, 28 Mar 2019 09:27:05 +0000 (09:27 +0000)]
Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""
Nicolas Geoffray [Thu, 28 Mar 2019 09:25:11 +0000 (09:25 +0000)]
Revert "Preload non-bootclasspath Java lib ClassLoaders."
This reverts commit
1b11aaaf9ba824dc5df363736d54601e908efec6.
Bug:
128529256
Bug:
127406460
Reason for revert: Breaks FSI
Change-Id: Ie9775779cda7b376c36493f3ce3246eafc672c59
Sundong Ahn [Thu, 28 Mar 2019 08:08:03 +0000 (01:08 -0700)]
Merge "Move the attribute tags"
am:
dcef50e27d
Change-Id: Ie01976685722f8cecf847544d2c04a4ece49f3f6
Treehugger Robot [Thu, 28 Mar 2019 07:48:59 +0000 (07:48 +0000)]
Merge "Move the attribute tags"
Chiachang Wang [Thu, 28 Mar 2019 05:53:24 +0000 (22:53 -0700)]
Merge "Align proto naming with server configuration"
am:
2cd6f2446c
Change-Id: Id06738516af325de8d68b60cdfb8f68e25cff94c
Chiachang Wang [Thu, 28 Mar 2019 05:37:21 +0000 (05:37 +0000)]
Merge "Align proto naming with server configuration"
markchien [Tue, 26 Mar 2019 13:41:59 +0000 (21:41 +0800)]
Close tethering when UI entitlement fails
This is a alternative way for moving TetherService logic
into EntitlementManager[1]. Settings would close tethering
when silent entitlement check fail. To be consistent,
tethering should also be closed if UI entitlement check
fails.
[1] https://android-review.googlesource.com/c/platform/frameworks/base/+/928136
bug:
129330738
Test: -build, flash, boot,
-atest EntitlementManagerTest
-manual test with carrier SIM
Change-Id: Idfc35461b6359f3a624e78d49b6f73812db6d8ab
chen xu [Thu, 28 Mar 2019 03:42:44 +0000 (20:42 -0700)]
Merge "support msim for captiveportal notification"
am:
edbf24ad3b
Change-Id: I3bed0b6d44a13a4dd1c68b21a28b75e4e6c7aa81
Treehugger Robot [Thu, 28 Mar 2019 03:28:19 +0000 (03:28 +0000)]
Merge "support msim for captiveportal notification"
markchien [Fri, 7 Sep 2018 08:19:12 +0000 (16:19 +0800)]
Only apply entitlement check to cellular upstream
Instead of doing a tethering entitlement check whenever we turn
on tethering, provisioning result should only affect mobile
upstream. List behavior changes below:
1. Change tether entitlement check from pre-flight check to
run-time check.
2. Only run entitlement check when upstream is mobile.
3. Move schedule entitlement re-check logic from Settings to
framework.
4. Run all entitlement thing in TetherMaster thread to avoid
multi-thread problem.
Test: -atest FrameworksNetTests
-build, flash, booted
bug:
111490073
Change-Id: Ic2980b4d6864d6f7287816c43eb6cf7a5cdec541
Merged-in: Ic2980b4d6864d6f7287816c43eb6cf7a5cdec541
felkachang [Tue, 16 Oct 2018 12:46:26 +0000 (20:46 +0800)]
To add the Android.bp of ExternalStorageProvider
ExternalStorageProvider doesn't have any tests yet.
1. Convert Android.mk to Android.bp
2. Add init testcase
3. formatted by bpfmt -s -w Android.bp
Fixes:
117812397
Bug:
122332340
Test: atest ExternalStorageProviderTests
Change-Id: I74235832f453110742de0b15cb14fac7514ecf0e
Merged-In: I74235832f453110742de0b15cb14fac7514ecf0e
Jack Yu [Thu, 28 Mar 2019 01:52:23 +0000 (18:52 -0700)]
Merge "Update Android Beam deprecated API description"
am:
527b6de018
Change-Id: Icf9d876a705f4f10365c836d3e0c15f476ce113e
Treehugger Robot [Thu, 28 Mar 2019 01:33:58 +0000 (01:33 +0000)]
Merge "Update Android Beam deprecated API description"
Junyu Lai [Thu, 28 Mar 2019 01:17:27 +0000 (18:17 -0700)]
Merge changes I0baf582f,I4bba01ba
am:
e5ee6b9b31
Change-Id: Ie69a03e6c61e172ba7e9948706fe6780be61a41b
Junyu Lai [Thu, 28 Mar 2019 00:53:20 +0000 (00:53 +0000)]
Merge changes I0baf582f,I4bba01ba
* changes:
Block unpriviledged apps which create keepalives with null fd
Fix keepalive don't get removed when lower layer error
Colin Cross [Thu, 28 Mar 2019 00:46:08 +0000 (17:46 -0700)]
Merge "Fix glob syntax"
am:
6a753ba787
Change-Id: Ia1bfd3f6323e557e17b2d6554a79582d504ed91d
Treehugger Robot [Thu, 28 Mar 2019 00:35:27 +0000 (00:35 +0000)]
Merge "Fix glob syntax"
Remi NGUYEN VAN [Thu, 28 Mar 2019 00:29:57 +0000 (17:29 -0700)]
Merge "Fix message names in dumpsys network_stack"
am:
3c776e8793
Change-Id: I5431c0a8b981716e02804cb13f5c59f65a89828c
Remi NGUYEN VAN [Thu, 28 Mar 2019 00:14:31 +0000 (00:14 +0000)]
Merge "Fix message names in dumpsys network_stack"
Steven Moreland [Wed, 27 Mar 2019 23:18:22 +0000 (16:18 -0700)]
Merge "Preload non-bootclasspath Java lib ClassLoaders."
am:
213812ba28
Change-Id: Ie16e82383bab53b5f92258289bf50ba9d7a897cd
Steven Moreland [Wed, 27 Mar 2019 22:59:49 +0000 (22:59 +0000)]
Merge "Preload non-bootclasspath Java lib ClassLoaders."
Yifan Hong [Thu, 14 Feb 2019 00:00:43 +0000 (16:00 -0800)]
Shutdown device gracefully when net discharging
Instead of checking the presence of power supplies, check
battery status to determine whether it should
shutdown. In detail, shutdown if
battery level == 0 && status != charging
Change-Id: Ie3d93d305e40f2f45d60538e7831f00be0380544
Fixes:
115715604
Test: boots
Malcolm Chen [Wed, 27 Feb 2019 00:49:56 +0000 (16:49 -0800)]
Show signal strength of current active subscription
For grouped primary and opportunistic use-case, if both are active,
mobile signal bar should by default show which one is currently
used for Internet data. Unless carrier set it otherwise -- if they
want to always show signal bar of primary subscription.
Bug:
123780907
Test: manual
Change-Id: I62e298e7b9bdc82dd44f0c8ae783c623e101b0ef
Merged-In: I62e298e7b9bdc82dd44f0c8ae783c623e101b0ef
Youming Ye [Wed, 27 Mar 2019 21:30:23 +0000 (14:30 -0700)]
Merge "Enable Telecom to bind third party InCallServices."
am:
90a9d627aa
Change-Id: I021f72505a6e516747dffd31b177bdac9e291d78
Malcolm Chen [Fri, 8 Mar 2019 23:27:38 +0000 (15:27 -0800)]
Update document of setSubscriptionEnabled public API.
Bug:
126391008
Test: build
Change-Id: Iffb7895f94f8d0b2d071edb1e06c8e99be14be4f
Merged-In: Iffb7895f94f8d0b2d071edb1e06c8e99be14be4f
Malcolm Chen [Thu, 28 Feb 2019 22:07:59 +0000 (14:07 -0800)]
Clean up shouldHideSubscription API
Combine shouldHideSubscription and isInvisibleSubscription
for better readability.
Bug:
126637721
Test: manual - use test app to call SubscriptionManager APIs to make
sure they return correct values.
Change-Id: I0deb463430a6825db40ec00abac49cb662e79437
Merged-In: I0deb463430a6825db40ec00abac49cb662e79437
Youming Ye [Wed, 27 Mar 2019 21:12:58 +0000 (21:12 +0000)]
Merge "Enable Telecom to bind third party InCallServices."
Xiangyu/Malcolm Chen [Wed, 27 Mar 2019 19:22:40 +0000 (12:22 -0700)]
Merge changes I592d3538,I791fd630
am:
42914720d8
Change-Id: Iae4c04c2f86d73c711d0ceab710ef1464c149370
Hayden Gomes [Wed, 27 Mar 2019 19:09:19 +0000 (12:09 -0700)]
Merge "Moving BT SMS logic to internal telephony"
am:
2b7db36a14
Change-Id: I8bfcbec0a6d2d892831b017349193aae16f0100f
Xiangyu/Malcolm Chen [Wed, 27 Mar 2019 19:06:12 +0000 (19:06 +0000)]
Merge changes I592d3538,I791fd630
* changes:
Add @Nullable on SubscriptionInfo#getGroupUuid
Adding nullability annotation.
Hayden Gomes [Wed, 27 Mar 2019 19:01:48 +0000 (19:01 +0000)]
Merge "Moving BT SMS logic to internal telephony"
Colin Cross [Tue, 26 Mar 2019 18:03:05 +0000 (11:03 -0700)]
Fix glob syntax
Globs are only intended to support ** as a directory, i.e. **/*.java
not **.java.
Bug:
129411151
Test: m nothing
Change-Id: I0f6cb7c7ce8cd1ef8c09364c0946ac7157285a4d
Jack Yu [Wed, 27 Mar 2019 16:51:07 +0000 (09:51 -0700)]
Merge "Renamed DataSpecificRegistrationState"
am:
86675ed5c0
Change-Id: Ice5fa2213a8a1850e6a6842c197d5926c0193b3c
Jack Yu [Wed, 27 Mar 2019 16:39:46 +0000 (16:39 +0000)]
Merge "Renamed DataSpecificRegistrationState"
Youming Ye [Tue, 2 Oct 2018 20:24:43 +0000 (13:24 -0700)]
Enable Telecom to bind third party InCallServices.
Changes for Telecom to bind third party companion apps or
automotive ui installed from Play Store. Add new permissions and
settings for the third party InCallService APIs.
Bug:
78174835
Test: Manual
Change-Id: I1b4eff28b9dfd61f1c951d14b6c82395b51fe769
Merged-In: I1b4eff28b9dfd61f1c951d14b6c82395b51fe769
Siarhei Vishniakou [Wed, 27 Mar 2019 14:55:01 +0000 (07:55 -0700)]
Merge "Move tag definitions into policy"
am:
3200c0bcb8
Change-Id: I64c8ac2e104c025ee3f4aed88d03e6c9aa9bcabe
Treehugger Robot [Wed, 27 Mar 2019 14:41:12 +0000 (14:41 +0000)]
Merge "Move tag definitions into policy"
Andrei-Valentin Onea [Wed, 27 Mar 2019 13:56:12 +0000 (06:56 -0700)]
Merge changes from topic "unsupported-internal"
am:
2f573ac6f8
Change-Id: I0fedf5c754a59a9c57b3abd00adff00d58b4930c
Andrei-Valentin Onea [Wed, 27 Mar 2019 13:40:15 +0000 (13:40 +0000)]
Merge changes from topic "unsupported-internal"
* changes:
Add @UnsupportedAppUsage annotations
Add android internal dirs to hiddenapi-mappings
junyulai [Wed, 27 Mar 2019 03:00:37 +0000 (11:00 +0800)]
Block unpriviledged apps which create keepalives with null fd
Currently, socketKeepalive implementation is accepting null fd
due to backward compatibility with legacy packet keepalive API.
However, due to lack of the fd, the service cannot guarantee the
port is not reused by another app if the caller release the port
for any reason.
Thus, grant the null fd access only for priviledged apps.
This commit also address some comments from aosp/918533.
Bug:
126699232
Test: atest FrameworksNetTests
Change-Id: I0baf582ff4ca8af6082c3754e8dfbcd867f39792
Andrei Onea [Wed, 27 Mar 2019 10:32:55 +0000 (10:32 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
com.android.internal.app
com.android.internal.database
com.android.internal.http
com.android.internal.os
com.android.internal.policy
com.android.internal.util
com.android.internal.view
com.android.internal.view.menu
com.android.internal.widget
com.android.server.net
com.android.server
com.google.android.collect
com.google.android.util
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: Ia5306f4713298b46ae3aba6fc9d87fae41f8a593
Change-Id: Ie26033d486033289ad3e010a534a921d29c3b2ca
Andrei Onea [Fri, 22 Mar 2019 14:56:51 +0000 (14:56 +0000)]
Add android internal dirs to hiddenapi-mappings
Bug:
110868826
Test: m hiddenapi-mappings
(cherry picked from commit
77b22e33b6f9f85567bddd420488f0e88fe27bff)
Merged-In: Ie13962cc6a58af88e63a95c7f0d846aceda11f53
Change-Id: Ic6d0f663f79466d0d8692a3ebfe4a9792cd7ca07
Chiachang Wang [Wed, 27 Mar 2019 09:33:52 +0000 (17:33 +0800)]
Align proto naming with server configuration
Update naming as server requirement.
Bug:
128887306
Test: build
Change-Id: Iae46b1e41a66b1ad7d0c166ac52d5442b0c4070d
Steven Moreland [Tue, 19 Mar 2019 03:15:28 +0000 (20:15 -0700)]
Preload non-bootclasspath Java lib ClassLoaders.
This is specifically for HIDL but is applicable to other libs.
Classes on the bootclasspath are implicitly used by apps. For this
reason, many classes should not go there. However, there are some
libraries which are used by many apps/processes which are still
nice to preload the ClassLoaders of.
Now, cacheNonBootclasspathSystemLibs in ApplciationLoaders keeps
a map of jar -> ClassLoader in zygote to be retrieved by child
processes.
Bug:
128529256
Bug:
127406460
Test: boot Pixel 2, verify libs are preloaded and used, try apps that
use these libraries.
Test: grep for ClassLoaderContext errors, for instance:
- ClassLoaderContext shared library size mismatch
- ClassLoaderContext classpath element mismatch
Test: showmap on various processes which use the preloaded libs.
Change-Id: I351bf1679e9a928c10dca860b6cd6cb414c3bb8e
Lorenzo Colitti [Wed, 27 Mar 2019 08:13:26 +0000 (01:13 -0700)]
Merge "Enable more logs for networking"
am:
f3736d67f8
Change-Id: I422863512aa78849dcb5d61d986d7f8bbff24fd2
Lorenzo Colitti [Wed, 27 Mar 2019 07:55:35 +0000 (07:55 +0000)]
Merge "Enable more logs for networking"
chen xu [Wed, 27 Mar 2019 01:24:43 +0000 (18:24 -0700)]
support msim for captiveportal notification
Bug:
123025093
Test: Manual
Change-Id: Ie04f3ae9a825ab75077a94b108ac92075b6d4753
Sundong Ahn [Wed, 27 Mar 2019 06:23:25 +0000 (15:23 +0900)]
Move the attribute tags
The attribute tags are moved to below the sequence tag, becuase the
"attribute" must be after "sequence" for complexType.
Bug:
127435354
Test: m -j
Change-Id: Ib1fb7fa516d379ef480e2bd18edee2a910b44ea7
Chenbo Feng [Wed, 27 Mar 2019 05:33:27 +0000 (22:33 -0700)]
Merge "Get the permission information for native services"
am:
743a1c8001
Change-Id: I806e3e948dfab0cc8c691c20f377bbc3a24240a6
Treehugger Robot [Wed, 27 Mar 2019 05:21:29 +0000 (05:21 +0000)]
Merge "Get the permission information for native services"
Jack Yu [Thu, 21 Mar 2019 23:33:15 +0000 (16:33 -0700)]
Renamed DataSpecificRegistrationState
Renamed DataSpecificRegistrationState to
DataSpecificRegistrationInfo. And added some
APIs to test API so they can be accessed by
CTS.
Test: Manual
Bug:
127657991
Merged-In: I1a623c18f02cfd19ca1af9df912d859b363f42d1
Change-Id: I1a623c18f02cfd19ca1af9df912d859b363f42d1
(cherry picked from commit
dba103204cf09187dbb0147dac39457f5993769f)
Remi NGUYEN VAN [Tue, 26 Mar 2019 05:58:08 +0000 (14:58 +0900)]
Fix message names in dumpsys network_stack
Constants were stripped out by ProGuard, so
MessageUtils.findMessageNames would fail to find them.
Test: flashed, dumpsys network_stack shows message names
Fixes:
124619824
Change-Id: I285ce2ab52cdff48f17b422285a635bd34243498
junyulai [Wed, 27 Mar 2019 02:31:11 +0000 (10:31 +0800)]
Fix keepalive don't get removed when lower layer error
Currently, if the lower layer, e.g. wifi, didn't successfully
start keepalive by any reason. Due to the startedState changed
to NOT_STARTED first, the logic inside stop() will skip the
removing process and cause leak.
Thus, moving the changing of startedState to proper place first
to unblock subsequent changes first.
Bug:
123988249
Bug:
129371366
Test: atest FrameworksNetTests
Change-Id: I4bba01bacc80e1dac2023ef831b5ade5501894e4
Remi NGUYEN VAN [Wed, 27 Mar 2019 03:09:17 +0000 (20:09 -0700)]
Merge "Use SystemApi framework parcelables directly"
am:
021ea66aea
Change-Id: I33ab2a6935edc25eb0cfcaee258ef6da92ed2c83
Treehugger Robot [Wed, 27 Mar 2019 02:55:15 +0000 (02:55 +0000)]
Merge "Use SystemApi framework parcelables directly"
Chenbo Feng [Wed, 27 Mar 2019 02:52:57 +0000 (19:52 -0700)]
Merge "Fix the INTERNET related permissions"
am:
88fb51277b
Change-Id: Id97b1ea945409e938158f30efd564b10c9e81380
Chenbo Feng [Tue, 26 Mar 2019 21:36:34 +0000 (14:36 -0700)]
Get the permission information for native services
For native services such as mediaserver and audioserver, the permission
information cannot be retrieved from getInstalledPackages. Instead, the
high level permission information is avalaible in systemConfigs. With
those permission information, netd can store the complete list of uids
that have UPDATE_DEVICE_STATS permission.
Bug:
128944261
Test: dumpsys netd trafficcontroller
Change-Id: I0331d5a3a5b927a351fcfe6689ef1ba2b993db0c
Treehugger Robot [Wed, 27 Mar 2019 02:35:35 +0000 (02:35 +0000)]
Merge "Fix the INTERNET related permissions"
Lucas Lin [Wed, 27 Mar 2019 01:41:00 +0000 (18:41 -0700)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
am:
9e3297a099
Change-Id: I0639d4ccd7c3211595ede82bce3daa87ae759e10
Lucas Lin [Wed, 27 Mar 2019 01:29:51 +0000 (01:29 +0000)]
Merge "Fix flaky test for ConnectivityServiceTest#testPartialConnectivity"
Badhri Jagan Sridharan [Wed, 27 Mar 2019 00:54:08 +0000 (17:54 -0700)]
Merge "Fix missing combination check SINK/DEVICE"
am:
25a7e6ed25
Change-Id: I3b8e25d60b051785c486555176472fd072163885
Treehugger Robot [Wed, 27 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Fix missing combination check SINK/DEVICE"
Badhri Jagan Sridharan [Mon, 25 Mar 2019 18:02:44 +0000 (11:02 -0700)]
Fix missing combination check SINK/DEVICE
While checking for possible role combinations, the SINK/HOST combination
seems to be mistakenly checked twice intead of SINK/DEVICE.
This CL fixes this. The code now checks for:
1. source & host
2. sink & host
3. source & device
4. sink & device
Bug:
119142682
Change-Id: I5e652fbf9313bd2c122fe728d58e577085632253
Merged-In: I5e652fbf9313bd2c122fe728d58e577085632253
Youming Ye [Tue, 26 Mar 2019 22:56:42 +0000 (15:56 -0700)]
Merge "Hide blocking pay phone option use carrier config"
am:
c365007e5f
Change-Id: I4385f33d658a394d80e0b0722faf5ca12df940f6
Amit Mahajan [Tue, 26 Mar 2019 22:45:52 +0000 (15:45 -0700)]
Merge "Device could not use wifi hotspot when data card switch to sim2"
am:
cd24e832e8
Change-Id: I9ae2b31e6dd3f4a4c575ff37b8a9df58eb2c2e70
Chenbo Feng [Fri, 8 Mar 2019 19:55:12 +0000 (11:55 -0800)]
Fix the INTERNET related permissions
Change the INTERNET permission implementation so it only block socket
creation when non of the packages under the same uid have internet
permission. Fix the UPDATE_DEVICE_STATS permission so only the uid that
own the permission can change it.
Bug:
111560570
Test: CtsNetTestCasesUpdateStatsPermission
CtsNetTestCasesInternetPermission
Change-Id: I42385526c191d4429f486cde01293b27fcc1374b
Treehugger Robot [Tue, 26 Mar 2019 22:10:58 +0000 (22:10 +0000)]
Merge "Hide blocking pay phone option use carrier config"
Amit Mahajan [Tue, 26 Mar 2019 21:18:23 +0000 (21:18 +0000)]
Merge "Device could not use wifi hotspot when data card switch to sim2"
Amin Shaikh [Tue, 26 Mar 2019 20:28:50 +0000 (13:28 -0700)]
Merge "Add bluetooth icon."
am:
af76131710
Change-Id: Id2ee34a49d26bcf8109b59f9012c750fe2da1be5
Siarhei Vishniakou [Mon, 25 Mar 2019 22:38:11 +0000 (15:38 -0700)]
Move tag definitions into policy
Currently, the tags are defined in system/core.
Instead, reserve a range in system/core and define the tags in policy.
Next, we add a flag for interceptKeyBeforeQueueing.
Bug:
128933363
Test: adb logcat -b events, turn on screen, then press power button and
observe the logs.
Change-Id: I1fde2a2e7451ec67987ad3b09abc28be64410427
Merged-In: I1fde2a2e7451ec67987ad3b09abc28be64410427
Treehugger Robot [Tue, 26 Mar 2019 18:30:30 +0000 (18:30 +0000)]
Merge "Add bluetooth icon."
Tadashi G. Takaoka [Tue, 26 Mar 2019 17:53:06 +0000 (10:53 -0700)]
Merge "Rename WM test filter to FrameworksTestsFilter"
am:
d824faeb46
Change-Id: I7a9eebc68ec839dde90f9cf7f9952ac67a3d94df
Treehugger Robot [Tue, 26 Mar 2019 17:32:22 +0000 (17:32 +0000)]
Merge "Rename WM test filter to FrameworksTestsFilter"
Tadashi G. Takaoka [Tue, 26 Mar 2019 10:19:01 +0000 (19:19 +0900)]
Rename WM test filter to FrameworksTestsFilter
This CL adds Window Manager related tests of FrameworksServicesTests
to the test filter, and adds a comment to each tests mentioning about
FrameworksTestsFilter.
Test: Pass all 85 non-flaky presubmit tests of FrameworksCoreTests specified
in FrameworksTestsFilter.
$ tradefed.sh run commandAndExit FrameworksCoreTests \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 133 non-flaky presubmit tests of FrameworksServicesTests
specified in FrameworksTestsFilter.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Test: Pass all 162 non-flaky presubmit tests of FrameworksServicesTests
specified as under package com.android.server.wm.
$ tradefed.sh run commandAndExit FrameworksServicesTests \
--instrumentation-arg selectTest=com.android.server.wm. \
--instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Bug:
122451194
Change-Id: I9592ff01158eec1b4ef4d0dd22be243e10bd198e
Merged-In: I9592ff01158eec1b4ef4d0dd22be243e10bd198e