Songchun Fan
4e19d8fda3
Merge "[incremental/installation] new API to add file to session"
2019-12-05 20:56:03 +00:00
Songchun Fan
b7c6d8d861
Merge "[incremental] data loader manager interface"
2019-12-05 20:55:50 +00:00
Alan Stokes
f25c755705
Merge "Add PackageManager#getInstallSourceInfo() to the API."
2019-12-05 15:57:02 +00:00
TreeHugger Robot
40067bbcd2
Merge "getWifiMacAddress: Enable for profile owner on org-owned device"
2019-12-05 15:02:19 +00:00
Neil Fuller
6d1e81ee34
Merge "Add suggestManualTimeZoneSuggestion to the client" am: 63d5f12489 am: 2447fe6f69
...
am: ee036c7535
2019-12-05 06:45:14 -08:00
Fabian Kozynski
1f6640123b
Merge "New Controls API @hide"
2019-12-05 14:15:24 +00:00
Neil Fuller
ee036c7535
Merge "Add suggestManualTimeZoneSuggestion to the client" am: 63d5f12489
...
am: 2447fe6f69
2019-12-05 06:09:31 -08:00
Neil Fuller
106f18a666
Add suggestManualTimeZoneSuggestion to the client
...
Add TimeZoneDetector.suggestManualTimeZone() to set the time zone
"manually" and switch the device policy manager code over to using
it.
Add RequiredPermission annotations to TimeZoneDetector while there.
Bug: 140712361
Test: treehugger only
Test: atest services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Change-Id: Id247fddfdd793732dd88294ee215eda37cd0be4c
2019-12-05 12:12:14 +00:00
Eran Messeri
6ba10db1e4
getWifiMacAddress: Enable for profile owner on org-owned device
...
Allow the profile owner on an organization-owned device to call
getWifiMacAddress.
Part of this change is introducing a new DeviceAdminInfo policy,
USES_POLICY_ORGANIZATION_OWNED_PROFILE_OWNER, which can be used
to find out if the admin is either device owner or profile owner
on organization-owned device.
Bug: 138709470
Bug: 145308393
Bug: 145336515
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testWifi
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testWifiMacAddress
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testWifi
Change-Id: Id790408a07b9dd19530563bd2aa9216a7333e863
2019-12-05 11:55:17 +00:00
markchien
6d32634b8a
Merge "Expose netId to SystemApi" am: 1d379ac065 am: 1952cb5129
...
am: 1d87d9b784
2019-12-05 00:43:27 -08:00
Xiao Ma
4ff3397343
Merge "Add DHCP Rapid Commit FILS support." am: 488c2b03d7 am: 2000a1410f
...
am: 9b115791e5
2019-12-05 00:42:35 -08:00
Charles Munger
9d5c54ddbb
Merge "Deprecate IntentService" am: 17d1d950ec am: bcdb5c84d3
...
am: 26bfde20d5
2019-12-05 00:32:14 -08:00
Zoey Chen
aeab4bda93
Merge "[Telephony mainline] Add SystemApi and NonNull annotation" am: 8e708ff380
...
am: ae95a26703
2019-12-05 00:16:29 -08:00
Zoey Chen
8e708ff380
Merge "[Telephony mainline] Add SystemApi and NonNull annotation"
2019-12-05 07:58:03 +00:00
PETER LIANG
35fc4484fb
Merge "Support the rich content for accessibility service (2/n)"
2019-12-05 06:41:31 +00:00
SongFerng Wang
1e7dc81c59
Merge "ServiceState merges voice and data into a single value"
2019-12-05 06:36:18 +00:00
Zoey Chen
3fcd72ed0a
Merge "[TelephonyMainline] Cannot remove AUTHORITY_URI from the public API."
2019-12-05 03:49:33 +00:00
markchien
1d87d9b784
Merge "Expose netId to SystemApi" am: 1d379ac065
...
am: 1952cb5129
2019-12-04 18:39:46 -08:00
Treehugger Robot
1d379ac065
Merge "Expose netId to SystemApi"
2019-12-05 02:29:41 +00:00
Xiao Ma
9b115791e5
Merge "Add DHCP Rapid Commit FILS support." am: 488c2b03d7
...
am: 2000a1410f
2019-12-04 18:23:16 -08:00
Xiao Ma
488c2b03d7
Merge "Add DHCP Rapid Commit FILS support."
2019-12-05 02:13:02 +00:00
Songchun Fan
4e758697eb
[incremental/installation] new API to add file to session
...
A new method called addInstallationFile() to add files to an installation session.
Test: builds
Change-Id: Iaf086f5cfbc131428668e37d83e7677f5d5bf586
2019-12-04 18:05:41 -08:00
David Su
a0bead651f
Merge changes from topics "android-os-connectivity-wifiactivityenergyinfo", "requestactivityinfo"
...
* changes:
Move WifiActivityEnergyInfo to android.os.connectivity
BatteryStats: Move WifiActivityEnergyInfo to android.os.connectivity
Statsd: Move WifiActivityEnergyInfo to android.os.connectivity
Formalize WifiManager#requestActivityInfo as @SystemApi
BatteryStats: Formalize WifiManager#requestActivityInfo
Statsd: Formalize WifiManager#requestActivityInfo
2019-12-05 01:19:27 +00:00
Peter Wang
cead28dcee
Merge "[Telephony Mainline] Expose hidden APIs and consts" am: 415143daf5
...
am: cfffdedc87
2019-12-04 15:55:20 -08:00
Peter Wang
415143daf5
Merge "[Telephony Mainline] Expose hidden APIs and consts"
2019-12-04 23:39:50 +00:00
Anthony Hugh
4d4e91db5e
Merge "Expose findCurrentGuestUser() to system apps"
2019-12-04 22:54:07 +00:00
satayev
8899e8f174
Merge "Handle overrideSourcePosition in unsupportedappusageprocessor." am: 168c609085 am: be7b380039
...
am: 271ca11abe
2019-12-04 14:44:45 -08:00
Charles Munger
26bfde20d5
Merge "Deprecate IntentService" am: 17d1d950ec
...
am: bcdb5c84d3
2019-12-04 14:29:38 -08:00
Charles Munger
17d1d950ec
Merge "Deprecate IntentService"
2019-12-04 22:17:28 +00:00
Jordan Liu
5e21a0deaa
Merge "Add API to send background intent"
2019-12-04 21:07:23 +00:00
Shashwat Razdan
d775eabbce
Merge "Added ACTION_UNPIN = 4 in ActionType"
2019-12-04 20:19:31 +00:00
Songchun Fan
6dd47b58c5
[incremental] data loader manager interface
...
Checking in the interface for data loader manager and installation
files in android.content.pm.
Copied from branch master-instamatic. TODO to update the code with
latest API design.
Test: builds
Change-Id: Ie87dd8b45dc18f538ddabf87e2899e958133ff04
2019-12-04 11:00:23 -08:00
Jordan Liu
45c0d54dfa
Add API to send background intent
...
Test: manual
Bug: 144108192
Change-Id: I93c49d377921830a2ae83217a3fbef5026982319
2019-12-04 10:36:37 -08:00
Automerger Merge Worker
57253a47ef
Merge "Deprecate LoginFilter" am: 254411a902 am: 755f6ae1a3
...
Change-Id: I995410bc4e2f56cfad092435eb34a570b58261b7
2019-12-04 18:03:39 +00:00
Chen Xu
c2c774a606
Merge "expose APIs for mainline telephony-sdk"
2019-12-04 18:02:28 +00:00
Jack Yu
b496fd8765
Merge "Added sub id to SmsCbMessage" am: 258e925cd6
...
am: 35132f9a21
2019-12-04 09:47:53 -08:00
Eran Messeri
ac767ac5d9
Merge "Device Identifiers access: only on organization-owned devices"
2019-12-04 17:42:56 +00:00
Automerger Merge Worker
8ed8527519
Merge "Rename priority to connection policy in bluetooth apis" am: 98c91be8ae am: a115281a2d
...
Change-Id: I243cf844883e088f82613a97fe061468bc126cdb
2019-12-04 17:37:42 +00:00
Jack Yu
258e925cd6
Merge "Added sub id to SmsCbMessage"
2019-12-04 17:34:01 +00:00
Alex Johnston
e9a5ccd42f
Merge "Replace setAutoTimeRequired and getAutoTimeRequired with setAutoTime and getAutoTime"
2019-12-04 16:59:19 +00:00
satayev
271ca11abe
Merge "Handle overrideSourcePosition in unsupportedappusageprocessor." am: 168c609085
...
am: be7b380039
2019-12-04 08:57:37 -08:00
Paul Hu
973a925ff9
Merge "Replace the permission of internal connectivity checks" am: 6be69420df
...
am: 3256e731e3
2019-12-04 08:51:28 -08:00
Charles Munger
755f6ae1a3
Merge "Deprecate LoginFilter" am: 254411a902
...
am: 3eefccbc20
2019-12-04 08:50:21 -08:00
Rahul Sabnis
a115281a2d
Merge "Rename priority to connection policy in bluetooth apis" am: 98c91be8ae
...
am: 0f3bfe6c3b
2019-12-04 08:48:47 -08:00
TreeHugger Robot
63330e6859
Merge "Fix SurfaceControl#captureLayers docs"
2019-12-04 16:25:50 +00:00
Eran Messeri
4a96031617
Device Identifiers access: only on organization-owned devices
...
Deprecate access to device identifiers on non organization-owned
devices.
This is in line with changes to device identifiers access made in
Android Q. Profile owner access to device identifiers on personal
devices was deprecated in Q and is now removed.
However, on an organization-owned device, for asset management
purposes, the profile owner maintains access to device identifiers as
well as the ability to perform device ID attestation.
This is done by adjusting the checkDeviceIdentifierAccess method in the
DevicePolicyManagerService to take into account whether the profile
owner is on organization-owned device.
Bug: 145336515
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testDeviceOwnerCanGetDeviceIdentifiers
Test: atest com.android.cts.devicepolicy.ManagedProfileTest#testProfileOwnerCanGetDeviceIdentifiers
Change-Id: I13486509b5af7acb4713adf8cb17fa301e647268
2019-12-04 16:10:28 +00:00
Automerger Merge Worker
9c965a575a
Merge "Add SystemApi to setActiveDevice in BluetoothAdapter" am: 52df59acb3 am: 9c8e9bcc68
...
Change-Id: I8bd8be4848dbab16882dbf368a8faa886635cd89
2019-12-04 15:56:19 +00:00
Automerger Merge Worker
026bd122de
Merge "Add a manual path for setting time zone" am: 7fcab2dba8 am: 57aaf1d427
...
Change-Id: I8a7113adfe3d420be6e3a99fb504859fc2f387ed
2019-12-04 15:54:54 +00:00
Automerger Merge Worker
3a9ace7b43
Merge "Camera: Avoid removing valid repeating requests" am: 0e7782c87b am: 468c1263cf
...
Change-Id: I5fec062950b09211988c3b784c1608dcfbaae191
2019-12-04 15:54:17 +00:00
Rahul Sabnis
9c8e9bcc68
Merge "Add SystemApi to setActiveDevice in BluetoothAdapter" am: 52df59acb3
...
am: 3d59aefb50
2019-12-04 07:44:01 -08:00
