Commit Graph

102876 Commits

Author SHA1 Message Date
Chiachang Wang
1cb71607bc Merge changes I97015365,Ic9db4b9b into rvc-dev
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
2020-03-18 10:15:15 +00:00
Zoey Chen
3312226652 Merge "[TelephonyMainline] @hide @SystemApi and revisit them in S. - CarrierColumns" into rvc-dev 2020-03-18 09:39:12 +00:00
TreeHugger Robot
24466c4924 Merge changes from topic "code_sync_from_aosp" into rvc-dev
* changes:
  Change naming to be more specific
  Update preferred payment related APIs
2020-03-18 08:17:36 +00:00
Andrii Kulian
10e5f36550 Merge "Don't override activity display adjustments with app config" into rvc-dev 2020-03-18 06:08:18 +00:00
Chiachang Wang
d4d035d6eb Add NattKeepalivePacketDataTest
Add test for constructor and parcel

Test: atest CtsNetTestCasesLatestSdk:android.net.NattKeepalivePacketDataTest
      on both Q and R devices
Bug: 151402211
Change-Id: I97015365604be1846e3ecbaf60ac99e334705565
Merged-In: I97015365604be1846e3ecbaf60ac99e334705565
2020-03-18 05:44:26 +00:00
Wei Wang
540c37bae3 Merge "Send DEVICE_IDLE and DISPLAY_INACTIVE hint from framework" into rvc-dev 2020-03-18 03:57:41 +00:00
Paul Murphy
a9fbd8e4d8 Merge "Update CompanionDeviceManager javadoc to include the COMPANION_APPROVE_WIFI_CONNECTIONS_PERMISSION" into rvc-dev 2020-03-18 03:23:09 +00:00
Mehdi Alizadeh
f9275345db Merge changes Ibfb3cf6f,I9a4bd220 into rvc-dev
* changes:
  Load Uri based shortcut drawable in LauncherApps
  Adds icon URI field to shortcutInfo
2020-03-18 02:59:03 +00:00
Joanne Chung
6d6ddf4502 Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev 2020-03-18 02:27:40 +00:00
Paul Murphy
515729d964 Update CompanionDeviceManager javadoc to include the
COMPANION_APPROVE_WIFI_CONNECTIONS_PERMISSION

Change-Id: I07b5ea07ccd0d28e589b586dd6fbf4816f035679
Test: None, this is strictly a javadoc update
Bug: 151311975
2020-03-17 16:53:17 -07:00
Wei Wang
80d224621f Send DEVICE_IDLE and DISPLAY_INACTIVE hint from framework
Bug: 140148621
Test: boot device
Change-Id: I34971fde28a80056c51d3c1501467f975c7e82a2
2020-03-17 16:11:42 -07:00
Junyu Lai
3a6a98f5bb Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev
* changes:
  [SP25] Rename functions that add Entry conditionally
  [SP24] Rename functions that add Entry unconditionally
  [SP23] Address misc API review comment about NetworkStats
  [SP21] Address comments for API council review about aosp/1172143
  [SP20] Check signature permission when accessing network stats provider
2020-03-17 23:11:34 +00:00
Shuo Qian
0d4f4e464e Merge "Hide several System APIs" into rvc-dev 2020-03-17 23:09:31 +00:00
Mehdi Alizadeh
98ffa48a7a Load Uri based shortcut drawable in LauncherApps
Bug: 143106625
Test: Manual test by publishing shortcuts with uri icons in a sample app
Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10

Change-Id: Ibfb3cf6f7dabdeed36b845ab6e026506978d972a
2020-03-17 15:43:01 -07:00
Philip P. Moltmann
379322f066 Merge "Suggested additions to permissions docs" into rvc-dev 2020-03-17 22:19:32 +00:00
TreeHugger Robot
173eb0db9b Merge "[framework] Extract v3 digest for v4 checking correctly" into rvc-dev 2020-03-17 21:22:35 +00:00
Beverly Tai
552d491f63 Merge "Give mConsolidatedPolicy a default value" into rvc-dev 2020-03-17 21:19:25 +00:00
Winson Chung
042f6dae6e Merge "Update comment for deprecated method" into rvc-dev 2020-03-17 21:01:17 +00:00
Xianyuan Jia
18ee16a6d5 Merge "Revert "Enabled Content Capture in Service"" into rvc-dev 2020-03-17 18:55:46 +00:00
TreeHugger Robot
82a087ddef Merge "Intercept the click from inline suggestion child view." into rvc-dev 2020-03-17 18:47:37 +00:00
Xianyuan Jia
d3f9626e04 Revert "Enabled Content Capture in Service"
This reverts commit 988f7e0cd4.

Reason for revert: Droidcop: Potential culprit for Bug b/151715362 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 151715362
Change-Id: I882d6f1a4c43f5331aa1e205a858d20f18ecf72d
2020-03-17 18:39:46 +00:00
Yuncheol Heo
e88d949e0a Merge "Create a general mapping between window types and inset types." into rvc-dev 2020-03-17 18:01:47 +00:00
Rob Carr
7e06b011a0 Merge "Explicitly exclude IME from Task Snapshots" into rvc-dev 2020-03-17 17:56:55 +00:00
TreeHugger Robot
e39527ff51 Merge "Clarify timestamp definition for SensorEvent" into rvc-dev 2020-03-17 17:29:38 +00:00
Mehdi Alizadeh
bcaa266fa7 Merge "Make LauncherApps#ShortcutQuery#setLocusId() public" into rvc-dev 2020-03-17 17:02:39 +00:00
Yurii Zubrytskyi
087cf41e51 [framework] Extract v3 digest for v4 checking correctly
Use the same ordering of digest algorithms as the apksigner and
the general v3 checking do.

Test: adb install --incremental <apk> with v4 signature
Bug: b/151241461
Change-Id: I5c4c8339d7fd2ba127bd0f453efc9c04a8be7ac7
2020-03-17 09:49:08 -07:00
Winson Chung
a8a123c1ea Merge "Add WCT call to set container hidden state" into rvc-dev 2020-03-17 16:35:58 +00:00
Marco Ballesio
e12741e825 Merge "freezer: thaw on dumpsys data collection" into rvc-dev 2020-03-17 16:07:27 +00:00
Cody Kesting
fffee66588 Merge "Add support for registering test networks with administrators." into rvc-dev 2020-03-17 15:31:26 +00:00
Cody Kesting
e09e0db478 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev 2020-03-17 15:29:55 +00:00
Abhijeet Kaur
4bd6e9d0a5 Merge "Move Scoped Storage compat flags definition to frameworks/base" into rvc-dev 2020-03-17 15:29:21 +00:00
junyulai
32fb2a0e7c [SP25] Rename functions that add Entry conditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record conditionally,
name them addEntry.
  addValues -> addEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Fix: 148895143
Change-Id: I9495a198cf247e6c79100f7ac1edcea370b071de
2020-03-17 14:59:59 +00:00
junyulai
88f89a0f02 [SP24] Rename functions that add Entry unconditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record unconditionally,
name them insertEntry.
  setIfaceValues -> insertEntry
  addEntry -> insertEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: I801ddc49e283a254b9586700c9b597c0adb0d459
Merged-In: I801ddc49e283a254b9586700c9b597c0adb0d459
(cherry picked from aosp/1256352)
2020-03-17 14:59:31 +00:00
TreeHugger Robot
1264239382 Merge "Make IME fit navgation bars at left and right sides" into rvc-dev 2020-03-17 14:59:29 +00:00
junyulai
90a118d499 [SP23] Address misc API review comment about NetworkStats
This change add several javadoc for NetworkStats and its Entry
class. Also remove IFACE_ALL constant accordlingly.

Test: atest FrameworkNetTests
Test: m doc-comment-check-docs
Bug: 148895143

Change-Id: Id1b8f41be79f847ad73197ff0e18258b6ee8a730
Merged-In: Id1b8f41be79f847ad73197ff0e18258b6ee8a730
(cherry picked from aosp/1256351)
2020-03-17 14:58:59 +00:00
junyulai
ea8f185b52 [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
Merged-In: I141393f229e772d2eb9f7c156849e379bd71b845
(cherry picked from aosp/1253717)
2020-03-17 14:57:59 +00:00
Automerger Merge Worker
af8d85fa0c [SP20] Check signature permission when accessing network stats provider
Currently, registerNetworkStatsProvider requires the
UPDATE_DEVICE_STATS permission. This is a privileged permission
so it can be granted to preinstalled apps. Thus, apps like
GmsCore, or preinstalled apps will be able to update network stats.

This change checks for a new permission that would only allow
signature apps to declare that. Also check
MAINLINE_NETWORK_STACK permission to allow NetworkStack process
to use it.

Test: adb shell dumpsys netstats
Test: atest FrameworksNetTests
Bug: 149652079

Change-Id: Iaecbf10a7610461bd52e315659006c7332c416e6
Merged-In: Iaecbf10a7610461bd52e315659006c7332c416e6
Merged-In: Idfebd0a1988c3dcfd812d87e30f6a2034d6fbf6b
(cherry picked from commit e9e8d8f9ff)
2020-03-17 14:53:33 +00:00
Beverly
430b71a149 Give mConsolidatedPolicy a default value
- To align mConsolidatedPolicy with mConfig
- Update documentation for NotificationManager#getConsolidatedPolicy

Test: atest SystemUITests
Fixes: 151077630
Change-Id: I9a769ac6907c7cf19e00ca9134183e10f9f864f5
2020-03-17 10:35:46 -04:00
Abhijeet Kaur
14c5d83597 Move Scoped Storage compat flags definition to frameworks/base
Currently the flags definition is in MediaProvider, which is an
apex module (updatable), and the flags values are now used in
frameworks/base as well (non-updatable).

Good to have flags definition in the constant component.

Bug: 150593967
Test: atest ExternalStorageHostTest
Test: atest com.android.providers.media
Test: manual
Merged-In: I0b06c068cb3957a7db8af5e14598724f72122736
Change-Id: I0b06c068cb3957a7db8af5e14598724f72122736
(cherry picked from commit 4a989379e8)
2020-03-17 12:54:17 +00:00
Tony Mak
a10f2b981a Merge "Remove local text classifier and related tests." into rvc-dev 2020-03-17 11:50:58 +00:00
Pavel Grafov
6e4ef9b5eb Merge "Make work profile maximum time off at least 3 days." into rvc-dev 2020-03-17 11:24:48 +00:00
Joanne Chung
099faf74e6 Fix broken tests in TextClassifierServiceTest.
We introduce SystemTCMetadata in ag/10605740 which centrializes the
needed information for the TCMS to process the requests. Because we
change the getPackageName() logic to return the calling package name
of SystemTCMetadata and the SystemTCMetadata is only created if the
event is from the SystemTC not other TCs. The tests fail because the
SelectionEvent.packageName is not populated.

This cl contains the following changes:
- Return the package name that the SelectionEvent or
TextClassificationContext originated from
- Fix incorrect javadoc of TextClassificationContext.getPackageName
- Always verify the calling package name for onSelectionEvent and
onTextClassifierEvent

Bug: 151614815
Test: atest TextClassifierServiceTest
Test: atest FrameworksCoreTests:android.view.textclassifier
Test: atest FrameworksCoreTests:android.widget.TextViewActivityTest
Test: atest CtsTextClassifierTestCases
Change-Id: Iabe1691d63e3ec6ac834984cf79b60faf9c0e765
2020-03-17 19:20:14 +08:00
Automerger Merge Worker
fcfddefedf Add support for registering test networks with administrators.
CTS testing for ConnectivityDiagnosticsManager requires registering
TestNetworks with the administrator UIDs set. This sets up the CTS
process to be an administrator over the test network, which allows it to
receive ConnectivityDiagnosticsCallback callbacks.

Bug: 148032944
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Test: atest IpSecManagerTunnelTest
Change-Id: I7a443c368cf1ac470fbe40883ca24bc3143153b0
Merged-In: I7a443c368cf1ac470fbe40883ca24bc3143153b0
(cherry picked from commit 7b105b6194)
2020-03-17 00:22:09 -07:00
Cody Kesting
9347e33557 Update ConnectivityDiagnosticsCallback function name.
API Council feedback suggests renaming ConnectivityDiagnosticsCallback
'onConnectivityReport' function to be 'onConnectivityReportAvailable'.

Bug: 150598997
Test: atest FrameworksNetTests
Change-Id: Ieea727ecee6cf358a53a215fd4b06233dfe967ea
(cherry picked from commit 324b224cc48fcb12125bd1727be70ad2effbfce3)
2020-03-17 00:16:58 -07:00
Lucas Lin
19f09b234a Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" into rvc-dev 2020-03-17 04:42:52 +00:00
Shuo Qian
1e154a345c Hide several System APIs
Test: Treehugger
Bug: 151241308
Change-Id: Ie611320f4651b83e0ced6f5c8fede34a8a0a41c1
2020-03-17 04:41:21 +00:00
Kweku Adams
e78f4abb70 Merge "Convert system forced reasons to flags." into rvc-dev 2020-03-17 04:28:24 +00:00
Shu Chen
422e7eada2 Merge "Makes the finger-to-cursor distance configurable via DeviceConfig." into rvc-dev 2020-03-17 03:18:55 +00:00
TreeHugger Robot
f931471bf4 Merge "Run codegen v15 on inline suggestion data classes" into rvc-dev 2020-03-17 03:13:25 +00:00
Rajeev Kumar
7cff642925 Merge "Revert "Enable settings_tether_all_in_one by default"" into rvc-dev 2020-03-17 03:09:23 +00:00