OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Change ProvisioningManager API as per review"
Brad Ebinger [Fri, 29 Mar 2019 18:42:42 +0000 (11:42 -0700)]
Merge "Change ProvisioningManager API as per review"
am: 54fffdc876

Change-Id: Ic108caf282809306a6f70e009055f6bc91b352c0

5 years agoMerge "Minor change for async DNS API"
Luke Huang [Fri, 29 Mar 2019 18:38:24 +0000 (11:38 -0700)]
Merge "Minor change for async DNS API"
am: 80be1b1127

Change-Id: I54a7695484b6523a92eaf246a4bb836fabc8957f

5 years agoMerge "Emergency Number format"
Shuo Qian [Fri, 29 Mar 2019 18:30:46 +0000 (11:30 -0700)]
Merge "Emergency Number format"
am: e5709bf75f

Change-Id: I335cd4ebe8974915f0af1162bdca42029b3afb98

5 years agoMerge "Change ProvisioningManager API as per review"
Brad Ebinger [Fri, 29 Mar 2019 18:23:35 +0000 (18:23 +0000)]
Merge "Change ProvisioningManager API as per review"

5 years agoMerge "Minor change for async DNS API"
Treehugger Robot [Fri, 29 Mar 2019 18:22:12 +0000 (18:22 +0000)]
Merge "Minor change for async DNS API"

5 years agoMerge "Emergency Number format"
Shuo Qian [Fri, 29 Mar 2019 18:11:26 +0000 (18:11 +0000)]
Merge "Emergency Number format"

5 years agoMerge "Update documentation for updateAvailableNetworks"
Sooraj Sasindran [Fri, 29 Mar 2019 17:34:48 +0000 (10:34 -0700)]
Merge "Update documentation for updateAvailableNetworks"
am: ae1e2eef9e

Change-Id: I2355bcc55f36a292302a630c2e04b902fdcf5c91

5 years agoMerge "Update documentation for updateAvailableNetworks"
Sooraj Sasindran [Fri, 29 Mar 2019 17:21:54 +0000 (17:21 +0000)]
Merge "Update documentation for updateAvailableNetworks"

5 years agoMerge "Unremove DnsResolver#query method used by external developers"
Lorenzo Colitti [Fri, 29 Mar 2019 15:09:18 +0000 (08:09 -0700)]
Merge "Unremove DnsResolver#query method used by external developers"
am: 3dd6df002b

Change-Id: I0c8b5b5fe68b99cacc4da10ae27b69fcab8685b7

5 years agoMerge "Unremove DnsResolver#query method used by external developers"
Lorenzo Colitti [Fri, 29 Mar 2019 14:46:11 +0000 (14:46 +0000)]
Merge "Unremove DnsResolver#query method used by external developers"

5 years agoMerge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with...
Ethan_Hu [Fri, 29 Mar 2019 14:18:23 +0000 (07:18 -0700)]
Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock."
am: 51e5edcb9b

Change-Id: I4f57eb27caffbf6462dcad23660f05efce21e74e

5 years agoMerge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with...
Treehugger Robot [Fri, 29 Mar 2019 14:04:27 +0000 (14:04 +0000)]
Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock."

5 years agoMerge "apf: Documentation improvements and code optimizations for keepalive filters"
Aaron Huang [Fri, 29 Mar 2019 13:16:36 +0000 (06:16 -0700)]
Merge "apf: Documentation improvements and code optimizations for keepalive filters"
am: f5166d5527

Change-Id: I9dea9a5a4013b5935178a49a6106a172c16c3612

5 years agoFixed NPE in RankingHelper.writeXml.
Ethan_Hu [Tue, 5 Mar 2019 06:58:32 +0000 (14:58 +0800)]
Fixed NPE in RankingHelper.writeXml.
Make sure that mRecords is operated with the object lock.

Bug:127290258
Test: Repeat to upgrade the App targetversion from less than O to a later version
Change-Id: I70e61c0fcd3071f32a430d45441ffe1376147a5d
Signed-off-by: Ethan_Hu <huyuxin3818@gmail.com>
Merged-In: Ic7f676499425fe54453384d7c03de5d95c03a713

5 years agoMerge "apf: Documentation improvements and code optimizations for keepalive filters"
Aaron Huang [Fri, 29 Mar 2019 13:03:20 +0000 (13:03 +0000)]
Merge "apf: Documentation improvements and code optimizations for keepalive filters"

5 years agoMinor change for async DNS API
Luke Huang [Fri, 29 Mar 2019 10:01:11 +0000 (18:01 +0800)]
Minor change for async DNS API

do the minor changes to address comments before

Bug: 129395490
Test: atest DnsResolverTest
Change-Id: I56e2e5bc4352ff5c979579247a333a41950079da

5 years agoUnremove DnsResolver#query method used by external developers
Luke Huang [Thu, 28 Mar 2019 05:56:31 +0000 (13:56 +0800)]
Unremove DnsResolver#query method used by external developers

This method was removed as part of addressing API council feedback in b/129261432
Add back previous DnsResolver#query which is already being used by developers.

Bug: 129395490
Test: atest DnsResolverTest

Change-Id: Ic956db204f3940d39d42e1b11dda39e57d356fad

5 years agoMerge "Add version attribute"
Sundong Ahn [Fri, 29 Mar 2019 09:36:10 +0000 (02:36 -0700)]
Merge "Add version attribute"
am: 5dfc73b9af

Change-Id: I074c0d33aaba94db75e7dc303904c2d9cdf26bcd

5 years agoMerge changes from topic "default_permissions"
Sundong Ahn [Fri, 29 Mar 2019 09:32:08 +0000 (02:32 -0700)]
Merge changes from topic "default_permissions"
am: 4dd28c02cd

Change-Id: I9c09fe88e0d5f36a13334a40bec17f8f8a530294

5 years agoMerge "Add version attribute"
Treehugger Robot [Fri, 29 Mar 2019 09:18:31 +0000 (09:18 +0000)]
Merge "Add version attribute"

5 years agoMerge changes from topic "default_permissions"
Treehugger Robot [Fri, 29 Mar 2019 09:18:13 +0000 (09:18 +0000)]
Merge changes from topic "default_permissions"

* changes:
  Change the package name
  Add maxOccurs

5 years agoMerge "Use IDnsResolver instead of INetd for resolver related binder commands"
Luke Huang [Fri, 29 Mar 2019 08:57:44 +0000 (01:57 -0700)]
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"
am: b9ef4dd299

Change-Id: Icca07604bc8f922c51493e72fde8c7377105bf8b

5 years agoMerge "Use IDnsResolver instead of INetd for resolver related binder commands"
Luke Huang [Fri, 29 Mar 2019 08:45:19 +0000 (08:45 +0000)]
Merge "Use IDnsResolver instead of INetd for resolver related binder commands"

5 years agoMerge "[KA09] add keepalive offload permission to shell"
Mark Chien [Fri, 29 Mar 2019 06:34:48 +0000 (23:34 -0700)]
Merge "[KA09] add keepalive offload permission to shell"
am: bc350db984

Change-Id: Ica5b5ec05731a7c840d1f7dd1534d532c524df04

5 years agoMerge "[KA09] add keepalive offload permission to shell"
Mark Chien [Fri, 29 Mar 2019 06:15:11 +0000 (06:15 +0000)]
Merge "[KA09] add keepalive offload permission to shell"

5 years agoMerge "Fix cancellation race problem for aysnc DNS API"
Luke Huang [Fri, 29 Mar 2019 03:32:40 +0000 (20:32 -0700)]
Merge "Fix cancellation race problem for aysnc DNS API"
am: 1859ae7e7d

Change-Id: I7e22c38c502fa0181e97057d9992c2a43c11b378

5 years agoMerge "Fix cancellation race problem for aysnc DNS API"
Luke Huang [Fri, 29 Mar 2019 03:15:32 +0000 (03:15 +0000)]
Merge "Fix cancellation race problem for aysnc DNS API"

5 years agoEmergency Number format
sqian [Fri, 15 Mar 2019 02:42:38 +0000 (19:42 -0700)]
Emergency Number format

Use PhoneNumberUtils#isDialable to check each character.

Bug: 123241078
Test: Treehugger
Change-Id: Icc9083ed4d6cdae22c3ede9433433ac8eeec4918
Merged-In: Icc9083ed4d6cdae22c3ede9433433ac8eeec4918
(cherry picked from commit 0197a96e8add2658d424d5d318b383281d702add)

5 years agoMerge changes from topic "vpn_data_accounting"
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

5 years agoMerge changes from topic "vpn_data_accounting"
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.

5 years agoUpdate documentation for updateAvailableNetworks
Sooraj Sasindran [Fri, 22 Mar 2019 22:14:12 +0000 (15:14 -0700)]
Update documentation for updateAvailableNetworks

Update documentation for updateAvailableNetworks
Bug: 128902411
Test: make

Change-Id: Ib6b6d72db3320e6c95f74b9371483f57bc90fee1

5 years agoMerge "Close tethering when UI entitlement fails"
markchien [Thu, 28 Mar 2019 23:45:07 +0000 (16:45 -0700)]
Merge "Close tethering when UI entitlement fails"
am: c3b3a5fa2e

Change-Id: I22ee932f2a9250f11e8bc9e27c03b86884440603

5 years agoMerge "Close tethering when UI entitlement fails"
Treehugger Robot [Thu, 28 Mar 2019 23:34:34 +0000 (23:34 +0000)]
Merge "Close tethering when UI entitlement fails"

5 years agoMerge "Clarify hasSelection description"
Hans Boehm [Thu, 28 Mar 2019 22:39:43 +0000 (15:39 -0700)]
Merge "Clarify hasSelection description"
am: 6bd5cf2bcc

Change-Id: Ia7f3d0eae07f978ad29a7f3e127f1bf71c14c8dc

5 years agoMerge "Change Values for Opportunistic Entry & Exit Thresholds"
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

5 years agoMerge "Clarify hasSelection description"
Hans Boehm [Thu, 28 Mar 2019 22:21:00 +0000 (22:21 +0000)]
Merge "Clarify hasSelection description"

5 years agoMerge "Change Values for Opportunistic Entry & Exit Thresholds"
Sooraj Sasindran [Thu, 28 Mar 2019 22:13:37 +0000 (22:13 +0000)]
Merge "Change Values for Opportunistic Entry & Exit Thresholds"

5 years agoChange ProvisioningManager API as per review
Brad Ebinger [Wed, 27 Mar 2019 23:51:59 +0000 (16:51 -0700)]
Change ProvisioningManager API as per review

Bug: 129344996
Test: Manual
Change-Id: I1c41cf1ae622ee24b4bed91c15d194518f91dac7

5 years agoChange 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

5 years agoMerge "Migrate frameworks/base/packages/Shell to androidx.test"
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

5 years agoMerge "Migrate frameworks/base/packages/Shell to androidx.test"
Treehugger Robot [Thu, 28 Mar 2019 19:56:53 +0000 (19:56 +0000)]
Merge "Migrate frameworks/base/packages/Shell to androidx.test"

5 years agoMerge "Shutdown device gracefully when net discharging"
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

5 years agoMerge "Shutdown device gracefully when net discharging"
Treehugger Robot [Thu, 28 Mar 2019 18:34:28 +0000 (18:34 +0000)]
Merge "Shutdown device gracefully when net discharging"

5 years agoMerge "Revert "improve mism support for phonestatelistner""
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

5 years agoMerge changes from topic "126637721"
Xiangyu/Malcolm Chen [Thu, 28 Mar 2019 18:10:36 +0000 (11:10 -0700)]
Merge changes from topic "126637721"
am: 9763d788ef

Change-Id: Ia1b93ffad154d8e149d172dd7694b4c58add03a9

5 years agoMerge "Revert "improve mism support for phonestatelistner""
Jayachandran Chinnakkannu [Thu, 28 Mar 2019 18:05:53 +0000 (18:05 +0000)]
Merge "Revert "improve mism support for phonestatelistner""

5 years agoMerge "To add the Android.bp of ExternalStorageProvider"
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

5 years agoMerge changes from topic "126637721"
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

5 years agoMove BatteryStats and StatsCompanionService to use NetworkStatsService.
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

5 years agoNetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
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

5 years agoTake all VPN underlying networks into account when migrating traffic for
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

5 years agoMerge "To add the Android.bp of ExternalStorageProvider"
Treehugger Robot [Thu, 28 Mar 2019 17:31:14 +0000 (17:31 +0000)]
Merge "To add the Android.bp of ExternalStorageProvider"

5 years agoRevert "improve mism support for phonestatelistner"
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

5 years agoFix cancellation race problem for aysnc DNS API
Luke Huang [Tue, 26 Mar 2019 07:50:10 +0000 (15:50 +0800)]
Fix cancellation race problem for aysnc DNS API

This problem might cause double-close fd and result in app crash
or unexpected behaviour

Bug: 129317069
Test: atest DnsResolverTest
      manual test with delaying response callback/cancel
Change-Id: I223234f527edafc51d34fa6be390419c05def8d8

5 years agoMerge "Only apply entitlement check to cellular upstream"
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

5 years agoMerge "Only apply entitlement check to cellular upstream"
Mark Chien [Thu, 28 Mar 2019 09:52:52 +0000 (09:52 +0000)]
Merge "Only apply entitlement check to cellular upstream"

5 years agoMerge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""
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

5 years agoMerge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""
Nicolas Geoffray [Thu, 28 Mar 2019 09:27:05 +0000 (09:27 +0000)]
Merge "Revert "Preload non-bootclasspath Java lib ClassLoaders.""

5 years agoRevert "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

5 years agoMerge "Move the attribute tags"
Sundong Ahn [Thu, 28 Mar 2019 08:08:03 +0000 (01:08 -0700)]
Merge "Move the attribute tags"
am: dcef50e27d

Change-Id: Ie01976685722f8cecf847544d2c04a4ece49f3f6

5 years agoMerge "Move the attribute tags"
Treehugger Robot [Thu, 28 Mar 2019 07:48:59 +0000 (07:48 +0000)]
Merge "Move the attribute tags"

5 years agoMerge "Align proto naming with server configuration"
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

5 years agoMerge "Align proto naming with server configuration"
Chiachang Wang [Thu, 28 Mar 2019 05:37:21 +0000 (05:37 +0000)]
Merge "Align proto naming with server configuration"

5 years ago[KA09] add keepalive offload permission to shell
markchien [Wed, 23 Jan 2019 09:24:10 +0000 (17:24 +0800)]
[KA09] add keepalive offload permission to shell

This change adds PACKET_KEEPALIVE_OFFLOAD to shell, which allows
shell or code with shell permission identity to use privileged
tcp keepalive offload API.

Bug: 114151147
Test: -atest ConnectivityManagerTest#testCreateTcpKeepalive
      -build, flash, boot

Change-Id: Ib6660a5eaa72f83042596481452be4d415383f02
Merged-in: Ib6660a5eaa72f83042596481452be4d415383f02

5 years agoClose tethering when UI entitlement fails
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

5 years agoMerge "support msim for captiveportal notification"
chen xu [Thu, 28 Mar 2019 03:42:44 +0000 (20:42 -0700)]
Merge "support msim for captiveportal notification"
am: edbf24ad3b

Change-Id: I3bed0b6d44a13a4dd1c68b21a28b75e4e6c7aa81

5 years agoMerge "support msim for captiveportal notification"
Treehugger Robot [Thu, 28 Mar 2019 03:28:19 +0000 (03:28 +0000)]
Merge "support msim for captiveportal notification"

5 years agoOnly apply entitlement check to cellular upstream
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

5 years agoTo add the Android.bp of ExternalStorageProvider
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

5 years agoMerge "Update Android Beam deprecated API description"
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

5 years agoMerge "Update Android Beam deprecated API description"
Treehugger Robot [Thu, 28 Mar 2019 01:33:58 +0000 (01:33 +0000)]
Merge "Update Android Beam deprecated API description"

5 years agoMerge changes I0baf582f,I4bba01ba
Junyu Lai [Thu, 28 Mar 2019 01:17:27 +0000 (18:17 -0700)]
Merge changes I0baf582f,I4bba01ba
am: e5ee6b9b31

Change-Id: Ie69a03e6c61e172ba7e9948706fe6780be61a41b

5 years agoMerge changes I0baf582f,I4bba01ba
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

5 years agoMerge "Fix glob syntax"
Colin Cross [Thu, 28 Mar 2019 00:46:08 +0000 (17:46 -0700)]
Merge "Fix glob syntax"
am: 6a753ba787

Change-Id: Ia1bfd3f6323e557e17b2d6554a79582d504ed91d

5 years agoMerge "Fix glob syntax"
Treehugger Robot [Thu, 28 Mar 2019 00:35:27 +0000 (00:35 +0000)]
Merge "Fix glob syntax"

5 years agoMerge "Fix message names in dumpsys network_stack"
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

5 years agoMerge "Fix message names in dumpsys network_stack"
Remi NGUYEN VAN [Thu, 28 Mar 2019 00:14:31 +0000 (00:14 +0000)]
Merge "Fix message names in dumpsys network_stack"

5 years agoMerge "Preload non-bootclasspath Java lib ClassLoaders."
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

5 years agoMerge "Preload non-bootclasspath Java lib ClassLoaders."
Steven Moreland [Wed, 27 Mar 2019 22:59:49 +0000 (22:59 +0000)]
Merge "Preload non-bootclasspath Java lib ClassLoaders."

5 years agoShutdown device gracefully when net discharging
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

5 years agoShow signal strength of current active subscription
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

5 years agoMerge "Enable Telecom to bind third party InCallServices."
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

5 years agoUpdate document of setSubscriptionEnabled public API.
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

5 years agoClean up shouldHideSubscription API
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

5 years agoMerge "Enable Telecom to bind third party InCallServices."
Youming Ye [Wed, 27 Mar 2019 21:12:58 +0000 (21:12 +0000)]
Merge "Enable Telecom to bind third party InCallServices."

5 years agoMerge changes I592d3538,I791fd630
Xiangyu/Malcolm Chen [Wed, 27 Mar 2019 19:22:40 +0000 (12:22 -0700)]
Merge changes I592d3538,I791fd630
am: 42914720d8

Change-Id: Iae4c04c2f86d73c711d0ceab710ef1464c149370

5 years agoMerge "Moving BT SMS logic to internal telephony"
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

5 years agoMerge changes I592d3538,I791fd630
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.

5 years agoMerge "Moving BT SMS logic to internal telephony"
Hayden Gomes [Wed, 27 Mar 2019 19:01:48 +0000 (19:01 +0000)]
Merge "Moving BT SMS logic to internal telephony"

5 years agoFix glob syntax
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

5 years agoMerge "Renamed DataSpecificRegistrationState"
Jack Yu [Wed, 27 Mar 2019 16:51:07 +0000 (09:51 -0700)]
Merge "Renamed DataSpecificRegistrationState"
am: 86675ed5c0

Change-Id: Ice5fa2213a8a1850e6a6842c197d5926c0193b3c

5 years agoMerge "Renamed DataSpecificRegistrationState"
Jack Yu [Wed, 27 Mar 2019 16:39:46 +0000 (16:39 +0000)]
Merge "Renamed DataSpecificRegistrationState"

5 years agoEnable Telecom to bind third party InCallServices.
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

5 years agoMerge "Move tag definitions into policy"
Siarhei Vishniakou [Wed, 27 Mar 2019 14:55:01 +0000 (07:55 -0700)]
Merge "Move tag definitions into policy"
am: 3200c0bcb8

Change-Id: I64c8ac2e104c025ee3f4aed88d03e6c9aa9bcabe

5 years agoMerge "Move tag definitions into policy"
Treehugger Robot [Wed, 27 Mar 2019 14:41:12 +0000 (14:41 +0000)]
Merge "Move tag definitions into policy"

5 years agoMerge changes from topic "unsupported-internal"
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

5 years agoMerge changes from topic "unsupported-internal"
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

5 years agoBlock unpriviledged apps which create keepalives with null fd
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

5 years agoAdd @UnsupportedAppUsage annotations
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

5 years agoAdd android internal dirs to hiddenapi-mappings
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