diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 12:04:00 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 12:04:00 -0800 |
| commit | 996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28 (patch) | |
| tree | 55ae2221ea34bc1bd0c3a407f89ed35e2bdd4212 /core/java | |
| parent | 8ec45de6fca5d470f27a0272c2b84a112ef9d2e9 (diff) | |
| parent | ef525e8d721a69310044eca14993df8b13ac1b14 (diff) | |
| download | frameworks_base-996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28.zip frameworks_base-996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28.tar.gz frameworks_base-996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28.tar.bz2 | |
Merge tag 'android-6.0.1_r74' into HEAD
CYNGNOS-3303
Android 6.0.1 release 74
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/DownloadManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index 682ab97..b382b76 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -1038,7 +1038,7 @@ public class DownloadManager { if (cursor.moveToFirst()) { int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS)); if (DownloadManager.STATUS_SUCCESSFUL == status) { - return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id); + return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id); } } } finally { @@ -1263,7 +1263,7 @@ public class DownloadManager { * @hide */ public Uri getDownloadUri(long id) { - return ContentUris.withAppendedId(mBaseUri, id); + return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id); } /** @@ -1344,7 +1344,7 @@ public class DownloadManager { // return content URI for cache download long downloadId = getLong(getColumnIndex(Downloads.Impl._ID)); - return ContentUris.withAppendedId(mBaseUri, downloadId).toString(); + return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, downloadId).toString(); } private long getReason(int status) { diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index b4006de..d7d248f 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1166,12 +1166,12 @@ public final class BluetoothDevice implements Parcelable { /** * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing. - * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}. * * @return true confirmation has been sent out * false for error */ - @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) + @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setPairingConfirmation(boolean confirm) { if (sService == null) { Log.e(TAG, "BT not enabled. Cannot set pairing confirmation"); |