Commit Graph

111234 Commits

Author SHA1 Message Date
Santiago Etchebehere
0ec06391e2 Merge "[Zoom-out 1/N] Add API in WallpaperManager" 2020-01-22 22:35:43 +00:00
TreeHugger Robot
3d004d168c Merge "Rewrite R constants before creating Application" 2020-01-22 22:08:41 +00:00
TreeHugger Robot
c4035ef38d Merge "Show RemoteInput images in notification history." 2020-01-22 22:05:00 +00:00
Automerger Merge Worker
8030e4860e Merge "Add @RequiresPermission annotation to SystemApis in BluetoothPan, open up close method as a SystemApi, and BluetoothPan class now implements AutoCloseable and CloseGuard" am: 23deb3367f am: 264da33fe5 am: 4aa1811337
Change-Id: I720267221928468a4aa5579363ad4eb341f97389
2020-01-22 21:49:25 +00:00
Automerger Merge Worker
81d8b9cea0 Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" am: b4dbfff366 am: 5a607f2666 am: 8371addcb4
Change-Id: Ib5c91460b57d58fad612c6bab74009b9282485bd
2020-01-22 21:48:33 +00:00
Rahul Sabnis
264da33fe5 Merge "Add @RequiresPermission annotation to SystemApis in BluetoothPan, open up close method as a SystemApi, and BluetoothPan class now implements AutoCloseable and CloseGuard"
am: 23deb3367f

Change-Id: Iaab890dc9ebefabbcb7809fe2e83221f11d7d9f0
2020-01-22 13:21:55 -08:00
Kweku Adams
881254f4cb Merge "Creating new RESTRICTED bucket." 2020-01-22 21:21:09 +00:00
Rahul Sabnis
5a607f2666 Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable"
am: b4dbfff366

Change-Id: If06bce0f62fee4121c0e4445178c13458cd4b7c6
2020-01-22 13:17:19 -08:00
Treehugger Robot
23deb3367f Merge "Add @RequiresPermission annotation to SystemApis in BluetoothPan, open up close method as a SystemApi, and BluetoothPan class now implements AutoCloseable and CloseGuard" 2020-01-22 21:09:47 +00:00
Treehugger Robot
b4dbfff366 Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" 2020-01-22 21:09:39 +00:00
Howard Yen
ba5a535640 Merge changes from topic "usb_gadget_reset"
* changes:
  Add svc usb resetUsbGadget method
  Support USB Gadget V1.1 HAL
2020-01-22 20:56:44 +00:00
TreeHugger Robot
bfbad6d3e0 Merge "Expose all TelephonyRegistryManager methods" 2020-01-22 20:41:09 +00:00
Aran Ink
2e3cc4169d Show RemoteInput images in notification history.
For cases where we can't show images, show "Image inserted" text instead. This will happen for work profile notifications, and for notifications that don't use MessagingStyle.

Test: Updated unit tests for NotificationRemoteInputManagerTest to use new RemoteInputHistoryItem structure, and to ensure support for URIs and mime types. Manual testing to ensure images appear in notification history for MessagingStyle notifications under the primary user, and that "Image inserted" appears for work-profile and non-messaging notifications.

Change-Id: I254b579aa710337039a7def6880f14a61bbd4d53
2020-01-22 15:22:19 -05:00
TreeHugger Robot
4b7531b05b Merge "Add TestApi to get UserHandle from URI." 2020-01-22 19:49:27 +00:00
Rahul Sabnis
dc125268fb Add @RequiresPermission annotation to SystemApis in BluetoothPan, open
up close method as a SystemApi, and BluetoothPan class now implements
AutoCloseable and CloseGuard

Bug: 146045934
Test: Manual
Change-Id: Iafb2157d67ae4f8e3d7d97cf4198f2978e391a8c
2020-01-22 11:30:59 -08:00
Danning Chen
5ff476a902 Merge "Add isConversation() API to NotificationRecord and a corresponding key in Adjustment" 2020-01-22 19:15:26 +00:00
Santiago Etchebehere
44a2831560 [Zoom-out 1/N] Add API in WallpaperManager
Add an API in WallpaperManager (client and server) and
WallpaperService to pass a wallpaper zoom value to the
wallpaper service and engine.

Bug: 146387434
Test: (added testDeliversZoomChanged)
Test: atest WallpaperServiceTest
Change-Id: Idd9ea2aefb845ad1d330cbdd6e088b926bcfece7
2020-01-22 10:51:04 -08:00
Santos Cordon
8f6ae9798e Merge "Add display configuration files." 2020-01-22 18:35:04 +00:00
Santos Cordon
4505e5e6e8 Add display configuration files.
Adds a static display configuration file for specifying static display
configurations as a sustainable API.

Bug: 131813802
Test: Verify brightness changes work as expected.  Verify changes going
through system to HAL conversion.
Exempt-From-Owner-Approval: I am new owner of lights, but OWNERS rights hasnt yet propogated.
Change-Id: I17922267f4695bc042d7c0687d4dcc10554e1b85
2020-01-22 18:34:39 +00:00
Mike Ma
cc7c338c48 Merge "Make ProtoOutputStream public"
am: 566f8f0195

Change-Id: Id322686c850a1aa273d31c60c86e4fe052390d21
2020-01-22 10:33:00 -08:00
Ying Xu
6fc642806f Merge "[Telephony Mainline] Telephony uses own user activity notification" 2020-01-22 18:30:06 +00:00
Amit Mahajan
77129e43f2 Merge changes from topics "npm-add-rm-listener-api", "rename-override-constants"
* changes:
  NetworkPolicyManager: Add @SystemApi for mainlne module
  Use Context.NETWORK_POLICY_SERVICE to get network policy service
  Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi
  Add setSubscriptionOverride() to system API
2020-01-22 18:26:49 +00:00
Perumaal Shanmugam
9f22c5356f Merge "Change provideContextImage() API to accept Bitmap" 2020-01-22 18:19:34 +00:00
Mike Ma
566f8f0195 Merge "Make ProtoOutputStream public" 2020-01-22 18:14:00 +00:00
Alex Kershaw
ba014acec8 Add TestApi to get UserHandle from URI.
I've added this to ContentProvider since it's where all of the existing
hidden logic where userinfo = userid lives.

Bug: 136249261
Test: atest CtsProviderTestCases:android.provider.cts.DocumentsContractTest
Change-Id: I3a815f2c8dd738140aec6937ce0d3b763bf49fba
2020-01-22 18:07:18 +00:00
TreeHugger Robot
177318a092 Merge "Change method to PackageManager#getBackgroundPermissionOptionLabel" 2020-01-22 18:06:29 +00:00
Kweku Adams
c6a9b341e4 Creating new RESTRICTED bucket.
This new bucket sits between RARE and NEVER and will have more severe
restrictions than RARE. Jobs, alarms, background services, and more will
be affected. For now, we just create the bucket. Changes to the various
subsystems will be done in separate CLs. This bucket is not meant to be
used if the user has used the app recently, so there are safeguards in
place to make sure that doesn't happen. A new system-internal API is
added so it's easier to track internal calls and so that other
subsystems can provide explicit reasons for forcing an app into the
bucket.

Bug: 145551233
Test: atest AppIdleHistoryTests
Test: atest AppStandbyControllerTests
Test: atest UsageStatsTest
Change-Id: I8ae2e6fd2353111f6bcc176a5a1929551db01e0f
2020-01-22 09:27:49 -08:00
TreeHugger Robot
351e3b3627 Merge "Update NetworkInfo public API." 2020-01-22 16:38:59 +00:00
Automerger Merge Worker
44d70123be Merge "Add API for CaptivePortalData" am: 144519f45d am: f3011f77d1 am: 36337e9ae1
Change-Id: I951f2eb2a0e2550f65ac87a84b76ea68c2449423
2020-01-22 16:27:53 +00:00
TreeHugger Robot
f3f7580965 Merge "Clarify lockNow usage from a managed profile" 2020-01-22 16:10:11 +00:00
Remi NGUYEN VAN
f3011f77d1 Merge "Add API for CaptivePortalData"
am: 144519f45d

Change-Id: Iaf58a9dbba5fd5fbe45ec4d795585efe9e3a9e2a
2020-01-22 08:05:11 -08:00
Oli Lan
14f52544cd Merge "Allow ModuleInfo to be retrieved using apex name." 2020-01-22 16:04:36 +00:00
Yogisha Dixit
648a443653 Merge "Add APIs in PowerManager for suppressing ambient display." 2020-01-22 16:01:42 +00:00
Automerger Merge Worker
f6d194648e Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 385afc999e am: 3a8c533d65 am: c6ac75035c
Change-Id: I9bc5d535a809f4873786edbd126ee6ab7a1a293d
2020-01-22 16:01:10 +00:00
Remi NGUYEN VAN
144519f45d Merge "Add API for CaptivePortalData" 2020-01-22 15:55:17 +00:00
Automerger Merge Worker
ac3c3256aa Merge "Add new module-lib APIs for MTS testing" am: b9e3e9e34c am: 876c59823e am: 8c4c7d0039
Change-Id: I37488a81d4066d240bdc0a22dbd3c72cafd55749
2020-01-22 15:35:36 +00:00
Remi NGUYEN VAN
3a8c533d65 Merge "Add NetworkCapabilities#getSSID to SystemApi"
am: 385afc999e

Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
2020-01-22 07:30:49 -08:00
Treehugger Robot
385afc999e Merge "Add NetworkCapabilities#getSSID to SystemApi" 2020-01-22 15:23:07 +00:00
TreeHugger Robot
892e8d8767 Merge "Reset unset app-ops when the admin sets cross-profile packages." 2020-01-22 15:23:02 +00:00
Neil Fuller
876c59823e Merge "Add new module-lib APIs for MTS testing"
am: b9e3e9e34c

Change-Id: I3acc8118e444ba3255f393a622ea8405c03ffe03
2020-01-22 07:09:25 -08:00
Neil Fuller
b9e3e9e34c Merge "Add new module-lib APIs for MTS testing" 2020-01-22 15:02:23 +00:00
Aaron Huang
9204f468b0 NetworkPolicyManager: Add @SystemApi for mainlne module
1) Add NetworkPolicyManager.registerSubscriptionCallback and
   NetworkPolicyManager.unregisterSubscriptionCallback for
   registering and unregister.
2) Create SubscriptionCallback to support new @SystemApi
   so that caller could use this object to register and
   unregister.

Bug: 138306002
Test: FrameworksNetTests
      FrameworksTelephonyTests

Change-Id: I56833254a93383e8054c96d296bcb54b777a6e33
2020-01-22 23:35:24 +09:00
Oli Lan
425dd66c95 Merge "Add ApexContext API including methods to get paths for data directories." 2020-01-22 14:13:41 +00:00
Chalard Jean
c4bcf75ff7 Update NetworkInfo public API.
Wifi needs to create these objects so it can include them
in the broadcasts.

Bug: 135998869
Test: FrameworksWifiTests
Change-Id: Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc
2020-01-22 06:07:00 -08:00
Aaron Huang
58d9559369 Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi
Add two interfaces to communicate with NetworkPolicyManagerService
and make them @SystemApi for mainline support.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I9f1168bbc70dce9b2b107e1f946737b1d85599c7
2020-01-22 23:03:28 +09:00
Aaron Huang
2d471ca1e1 Add setSubscriptionOverride() to system API
Add new API setSubscriptionOverride() in NetworkPolicyManager
and rename constants OVERRIDE_* to SUBSCRIPTION_OVERRIDE_*.
Make them @SystemApi for mainline support.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I56c777aa66d6f455695f133f9889979c13cd1bc8
2020-01-22 23:01:47 +09:00
Will Brockman
427b412abf Merge "Add instance IDs to UiEventReported atom." 2020-01-22 14:01:21 +00:00
Remi NGUYEN VAN
aa4c511696 Add NetworkCapabilities#getSSID to SystemApi
setSSID was added to the API, so it makes sense to have getSSID be part
of the API as well.

Test: m
Bug: 139268426
Change-Id: I6fa9c513ce4fb8ce1e3530776ce8fd5b2e77055e
2020-01-22 22:52:53 +09:00
Remi NGUYEN VAN
ead1ef41ee Add API for CaptivePortalData
CaptivePortalData will be used to hold data advertised by the network
following RFC7710bis.

To fetch the CaptivePortalData, the API URL is added to LinkProperties,
to be provided by the NetworkAgent.

Because CaptivePortalData can be used to guess user location (especially
from the URLs provided by the portal), it is only exposed to
applications that have privileged permissions.

Test: atest FrameworksNetTests
Bug: 139269711
Change-Id: I341175b5fece8ee00e19898af5e8eabe66cefbf3
2020-01-22 22:27:44 +09:00
Alex Kershaw
4b0197d8ba Reset unset app-ops when the admin sets cross-profile packages.
When the admin unsets cross-profile packages, reset the
INTERACT_ACROSS_PROFILES app-op back to the default if it is no longer
configurable by the user.

Other minor changes:
- Remove the explicit app-op permission check from
setInteractAcrossProfilesAppOp, since AppOpManager performs that check
when required.
- Fix the broadcasting logic in CrossProfileAppsServiceImpl to correctly
set the component and flags.

Bug: 136249261
Bug: 148010178
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileCrossProfileTest
Change-Id: Ib8b5f331fb92fc475bc95ad039adf93fac04da37
2020-01-22 13:20:24 +00:00