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

Commit 2e74400a authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-25832108-BAL_StrictMode-KWLHEGFBWS" into main 

* changes:
  Revert "Create a Strict Mode violation for Background Activity L..."
  Revert "Fix test for Strict Mode change"
parents c703aec7 a7f99b57

core/api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -34179,7 +34179,6 @@ package android.os { 
    method public android.os.StrictMode.VmPolicy build();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectActivityLeaks();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectAll();

    method @FlaggedApi("com.android.window.flags.bal_strict_mode") @NonNull public android.os.StrictMode.VmPolicy.Builder detectBlockedBackgroundActivityLaunch();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectCleartextNetwork();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectContentUriWithoutPermission();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectCredentialProtectedWhileLocked();
@@ -34192,7 +34191,6 @@ package android.os { 
    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectNonSdkApiUsage();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectUnsafeIntentLaunch();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectUntaggedSockets();

    method @FlaggedApi("com.android.window.flags.bal_strict_mode") @NonNull public android.os.StrictMode.VmPolicy.Builder ignoreBlockedBackgroundActivityLaunch();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyDeath();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();

    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();

core/java/android/app/IActivityTaskManager.aidl

+0 −17
Original line number Diff line number Diff line
@@ -358,23 +358,6 @@ interface IActivityTaskManager { 
    android.window.BackNavigationInfo startBackNavigation(

            in RemoteCallback navigationObserver, in BackAnimationAdapter adaptor);



    /**

     * registers a callback to be invoked when a background activity launch is aborted.

     *

     * @param observer callback to be registered.

     * @return true if the callback was successfully registered, false otherwise.

     * @hide

     */

    boolean registerBackgroundActivityStartCallback(in IBinder binder);



    /**

     * unregisters a callback to be invoked when a background activity launch is aborted.

     *

     * @param observer callback to be registered.

     * @hide

     */

    void unregisterBackgroundActivityStartCallback(in IBinder binder);



    /**

     * registers a callback to be invoked when the screen is captured.

     *

core/java/android/app/IBackgroundActivityLaunchCallback.aidl

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

* Copyright 2024, The Android Open Source Project

*

* Licensed under the Apache License, Version 2.0 (the "License");

* you may not use this file except in compliance with the License.

* You may obtain a copy of the License at

*

*     http://www.apache.org/licenses/LICENSE-2.0

*

* Unless required by applicable law or agreed to in writing, software

* distributed under the License is distributed on an "AS IS" BASIS,

* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

* See the License for the specific language governing permissions and

* limitations under the License.

*/



package android.app;



/**

 * Callback to find out when a background activity launch is aborted.

 * @hide

 */

oneway interface IBackgroundActivityLaunchCallback

{

    void onBackgroundActivityLaunchAborted(in String message);

}

core/java/android/os/StrictMode.java

+0 −81
Original line number Diff line number Diff line
@@ -20,22 +20,17 @@ import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; 
import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__EXPLICIT_INTENT_FILTER_UNMATCH;

import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__INTERNAL_NON_EXPORTED_COMPONENT_MATCH;

import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__NULL_ACTION_MATCH;

import static com.android.window.flags.Flags.balStrictMode;



import android.animation.ValueAnimator;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.app.ActivityThread;

import android.app.IActivityManager;

import android.app.IBackgroundActivityLaunchCallback;

import android.app.IUnsafeIntentStrictModeCallback;

import android.app.PendingIntent;

import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;
@@ -50,7 +45,6 @@ import android.content.res.Configuration; 
import android.net.TrafficStats;

import android.net.Uri;

import android.os.storage.IStorageManager;

import android.os.strictmode.BackgroundActivityLaunchViolation;

import android.os.strictmode.CleartextNetworkViolation;

import android.os.strictmode.ContentUriWithoutPermissionViolation;

import android.os.strictmode.CredentialProtectedWhileLockedViolation;
@@ -88,7 +82,6 @@ import com.android.internal.os.RuntimeInit; 
import com.android.internal.util.FastPrintWriter;

import com.android.internal.util.HexDump;

import com.android.internal.util.Preconditions;

import com.android.window.flags.Flags;



import dalvik.system.BlockGuard;

import dalvik.system.CloseGuard;
@@ -273,7 +266,6 @@ public final class StrictMode { 
            DETECT_VM_IMPLICIT_DIRECT_BOOT,

            DETECT_VM_INCORRECT_CONTEXT_USE,

            DETECT_VM_UNSAFE_INTENT_LAUNCH,

            DETECT_VM_BACKGROUND_ACTIVITY_LAUNCH_ABORTED,

            PENALTY_GATHER,

            PENALTY_LOG,

            PENALTY_DIALOG,
@@ -317,8 +309,6 @@ public final class StrictMode { 
    private static final int DETECT_VM_INCORRECT_CONTEXT_USE = 1 << 12;

    /** @hide */

    private static final int DETECT_VM_UNSAFE_INTENT_LAUNCH = 1 << 13;

    /** @hide */

    private static final int DETECT_VM_BACKGROUND_ACTIVITY_LAUNCH_ABORTED = 1 << 14;



    /** @hide */

    private static final int DETECT_VM_ALL = 0x0000ffff;
@@ -912,9 +902,6 @@ public final class StrictMode { 
                if (targetSdk >= Build.VERSION_CODES.S) {

                    detectUnsafeIntentLaunch();

                }

                if (balStrictMode() && targetSdk > Build.VERSION_CODES.VANILLA_ICE_CREAM) {

                    detectBlockedBackgroundActivityLaunch();

                }



                // TODO: Decide whether to detect non SDK API usage beyond a certain API level.

                // TODO: enable detectImplicitDirectBoot() once system is less noisy
@@ -1152,39 +1139,6 @@ public final class StrictMode { 
                return disable(DETECT_VM_UNSAFE_INTENT_LAUNCH);

            }



            /**

             * Detects when your app is blocked from launching a background activity or a

             * PendingIntent created by your app cannot be launched.

             * <p>

             * Starting an activity requires <a

             * href="https://developer.android.com/guide/components/activities/background-starts

             * ">specific permissions</a> which may depend on the state at runtime and especially

             * in case of {@link android.app.PendingIntent} starts on the collaborating app.

             * If the activity start is blocked methods like {@link Context#startActivity(Intent)}

             * or {@link PendingIntent#send()} have no way to return that information. Instead you

             * can use this strct mode feature to detect blocked starts.

             * <p>

             * Note that in some cases blocked starts may be unavoidable, e.g. when the user clicks

             * the home button while the app tries to start a new activity.

             */

            @SuppressWarnings("BuilderSetStyle")

            @FlaggedApi(Flags.FLAG_BAL_STRICT_MODE)

            public @NonNull Builder detectBlockedBackgroundActivityLaunch() {

                return enable(DETECT_VM_BACKGROUND_ACTIVITY_LAUNCH_ABORTED);

            }



            /**

             * Stops detecting whether your app is blocked from launching a background activity or

             * a PendingIntent created by your app cannot be launched.

             * <p>

             * This disables the effect of {@link #detectBlockedBackgroundActivityLaunch()}.

             */

            @SuppressWarnings("BuilderSetStyle")

            @FlaggedApi(Flags.FLAG_BAL_STRICT_MODE)

            public @NonNull Builder ignoreBlockedBackgroundActivityLaunch() {

                return disable(DETECT_VM_BACKGROUND_ACTIVITY_LAUNCH_ABORTED);

            }



            /**

             * Crashes the whole process on violation. This penalty runs at the end of all enabled

             * penalties so you'll still get your logging or other violations before the process
@@ -2179,25 +2133,10 @@ public final class StrictMode { 
                registerIntentMatchingRestrictionCallback();

            }



            if ((sVmPolicy.mask & DETECT_VM_BACKGROUND_ACTIVITY_LAUNCH_ABORTED) != 0) {

                registerBackgroundActivityLaunchCallback();

            }



            setBlockGuardVmPolicy(sVmPolicy.mask);

        }

    }



    private static void registerBackgroundActivityLaunchCallback() {

        try {

            ActivityTaskManager.getService().registerBackgroundActivityStartCallback(

                    new BackgroundActivityLaunchCallback());

        } catch (DeadObjectException e) {

            // ignore

        } catch (RemoteException e) {

            Log.e(TAG, "RemoteException handling StrictMode violation", e);

        }

    }



    private static final class UnsafeIntentStrictModeCallback

            extends IUnsafeIntentStrictModeCallback.Stub {

        @Override
@@ -2222,16 +2161,6 @@ public final class StrictMode { 
        }

    }



    private static final class BackgroundActivityLaunchCallback

            extends IBackgroundActivityLaunchCallback.Stub {

        @Override

        public void onBackgroundActivityLaunchAborted(String message) {

            if (StrictMode.vmBackgroundActivityLaunchEnabled()) {

                StrictMode.onBackgroundActivityLaunchAborted(message);

            }

        }

    }



    /** Gets the current VM policy. */

    public static VmPolicy getVmPolicy() {

        synchronized (StrictMode.class) {
@@ -2306,11 +2235,6 @@ public final class StrictMode { 
        return (sVmPolicy.mask & DETECT_VM_UNSAFE_INTENT_LAUNCH) != 0;

    }



    /** @hide */

    public static boolean vmBackgroundActivityLaunchEnabled() {

        return (sVmPolicy.mask & DETECT_VM_BACKGROUND_ACTIVITY_LAUNCH_ABORTED) != 0;

    }



    /** @hide */

    public static void onSqliteObjectLeaked(String message, Throwable originStack) {

        onVmPolicyViolation(new SqliteObjectLeakedViolation(message, originStack));
@@ -2478,11 +2402,6 @@ public final class StrictMode { 
        onVmPolicyViolation(new UnsafeIntentLaunchViolation(intent, msg + intent));

    }



    /** @hide */

    public static void onBackgroundActivityLaunchAborted(String message) {

        onVmPolicyViolation(new BackgroundActivityLaunchViolation(message));

    }



    /** Assume locked until we hear otherwise */

    private static volatile boolean sCeStorageUnlocked = false;

core/java/android/os/strictmode/BackgroundActivityLaunchViolation.java

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.os.strictmode;



import android.annotation.NonNull;

import android.app.Activity;



/**

 * Violation raised when your app is blocked from launching an {@link Activity}

 * (from the background).

 * <p>

 * This occurs when the app:

 * <ul>

 *     <li>Does not have sufficient privileges to launch the Activity.</li>

 *     <li>Has not explicitly opted-in to launch the Activity.</li>

 * </ul>

 * Violations may affect the functionality of your app and should be addressed to ensure

 * proper behavior.

 * @hide

 */

public class BackgroundActivityLaunchViolation extends Violation {



    /** @hide */

    public BackgroundActivityLaunchViolation(@NonNull String message) {

        super(message);

    }

}