Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95709ba6 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

Derestrict some non-SDK APIs. 

Per request from a partner, these APIs will not be restricted as they
are in use. This is conceptually a partial revert of change 5d123b67.

NoNonSdkCheck: b/170729553

Bug: 171933273
Test: Treehugger
Change-Id: Ibb525e9a9e2fc90248b74f45f3cdcb0be7487c3a
parent 281c9722

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -2284,7 +2284,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        return null;

    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public final LoadedApk getPackageInfo(ApplicationInfo ai, CompatibilityInfo compatInfo,

            int flags) {

        boolean includeCode = (flags&Context.CONTEXT_INCLUDE_CODE) != 0;

core/java/android/bluetooth/BluetoothA2dp.java

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

            "android.bluetooth.a2dp.profile.action.ACTIVE_DEVICE_CHANGED";
@@ -409,7 +409,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) log("setActiveDevice(" + device + ")");

        try {
@@ -433,7 +433,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * is active

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothDevice getActiveDevice() {

core/java/android/bluetooth/BluetoothAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ public final class BluetoothAdapter { 
     * @return true to indicate adapter shutdown has begun, or false on immediate error

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public boolean disable(boolean persist) {



        try {

core/java/android/bluetooth/BluetoothHeadset.java

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

            "android.bluetooth.headset.profile.action.ACTIVE_DEVICE_CHANGED";
@@ -1130,7 +1130,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADMIN)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) {

            Log.d(TAG, "setActiveDevice: " + device);
@@ -1156,7 +1156,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
     * is active.

     * @hide

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public BluetoothDevice getActiveDevice() {

core/java/android/content/pm/IPackageManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ import android.content.IntentSender; 
 */

interface IPackageManager {

    void checkPackageStartable(String packageName, int userId);

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    @UnsupportedAppUsage(trackingBug = 171933273)

    boolean isPackageAvailable(String packageName, int userId);

    @UnsupportedAppUsage

    PackageInfo getPackageInfo(String packageName, int flags, int userId);