Snap for 5321987 from c7e26f7fbb87a62fb6a92973543a04e7d901dc28 to qt-release (b8f412d3) · Commits · e / os / android_frameworks_base

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ java_defaults {
		"core/java/android/app/ITaskStackListener.aidl",
		"core/java/android/app/IBackupAgent.aidl",
		"core/java/android/app/IEphemeralResolver.aidl",
		"core/java/android/app/IInputForwarder.aidl",
		"core/java/android/app/IInstantAppResolver.aidl",
		"core/java/android/app/IInstrumentationWatcher.aidl",
		"core/java/android/app/INotificationManager.aidl",

api/TEST_MAPPING

+3 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,9 @@
		"presubmit": [
		{
		"name": "CtsCurrentApiSignatureTestCases"
		},
		{
		"name": "GtsUnofficialApisUsageTestCases"
		}
		]
		}

api/current.txt

+9 −8

Original line number	Diff line number	Diff line
		@@ -29939,7 +29939,7 @@ package android.net.wifi {
		method public java.util.List<android.net.wifi.ScanResult> getScanResults();
		method public int getWifiState();
		method public boolean is5GHzBandSupported();
		method public boolean isDeviceToApRttSupported();
		method @Deprecated public boolean isDeviceToApRttSupported();
		method public boolean isEasyConnectSupported();
		method public boolean isEnhancedPowerReportingSupported();
		method public boolean isOweSupported();
		@@ -35683,6 +35683,7 @@ package android.os.storage {
		method public String getMountedObbPath(String);
		method @NonNull public android.os.storage.StorageVolume getPrimaryStorageVolume();
		method @Nullable public android.os.storage.StorageVolume getStorageVolume(java.io.File);
		method @NonNull public android.os.storage.StorageVolume getStorageVolume(@NonNull android.net.Uri);
		method @NonNull public java.util.List<android.os.storage.StorageVolume> getStorageVolumes();
		method @NonNull public java.util.UUID getUuidForPath(@NonNull java.io.File) throws java.io.IOException;
		method public boolean isAllocationSupported(@NonNull java.io.FileDescriptor);
		@@ -38609,13 +38610,13 @@ package android.provider {

		public static final class MediaStore.Images.Media implements android.provider.MediaStore.Images.ImageColumns {
		ctor public MediaStore.Images.Media();
		method public static android.graphics.Bitmap getBitmap(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException, java.io.IOException;
		method @Deprecated public static android.graphics.Bitmap getBitmap(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException, java.io.IOException;
		method public static android.net.Uri getContentUri(String);
		method public static String insertImage(android.content.ContentResolver, String, String, String) throws java.io.FileNotFoundException;
		method public static String insertImage(android.content.ContentResolver, android.graphics.Bitmap, String, String);
		method public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
		method public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String);
		method public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String[], String);
		method @Deprecated public static String insertImage(android.content.ContentResolver, String, String, String) throws java.io.FileNotFoundException;
		method @Deprecated public static String insertImage(android.content.ContentResolver, android.graphics.Bitmap, String, String);
		method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
		method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String);
		method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String[], String);
		field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/image";
		field public static final String DEFAULT_SORT_ORDER = "bucket_display_name";
		field public static final android.net.Uri EXTERNAL_CONTENT_URI;
		@@ -38684,7 +38685,7 @@ package android.provider {

		public static final class MediaStore.Video {
		ctor public MediaStore.Video();
		method public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
		method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
		field public static final String DEFAULT_SORT_ORDER = "_display_name";
		}

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -4642,7 +4642,7 @@ package android.net.wifi {
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();
		method public boolean isDeviceToDeviceRttSupported();
		method @Deprecated public boolean isDeviceToDeviceRttSupported();
		method public boolean isPortableHotspotSupported();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();
		method public boolean isWifiScannerSupported();

cmds/idmap2/idmap2d/aidl/android/os/IIdmap2.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ interface IIdmap2 {
		const int POLICY_SYSTEM_PARTITION = 0x00000002;
		const int POLICY_VENDOR_PARTITION = 0x00000004;
		const int POLICY_PRODUCT_PARTITION = 0x00000008;
		const int POLICY_SIGNATURE = 0x00000010;

		@utf8InCpp String getIdmapPath(@utf8InCpp String overlayApkPath, int userId);
		boolean removeIdmap(@utf8InCpp String overlayApkPath, int userId);