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

Commit 092d067e authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch 'epic326-u-a14' into 'v1-u' 

Port changes from Android T

See merge request e/os/android_frameworks_base!212
parents f19ccf53 da5e46c0

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ package android { 
    field public static final String EXECUTE_APP_ACTION = "android.permission.EXECUTE_APP_ACTION";

    field public static final String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR";

    field public static final String FACTORY_TEST = "android.permission.FACTORY_TEST";

    field public static final String FAKE_PACKAGE_SIGNATURE = "android.permission.FAKE_PACKAGE_SIGNATURE";

    field public static final String FOREGROUND_SERVICE = "android.permission.FOREGROUND_SERVICE";

    field public static final String FOREGROUND_SERVICE_CAMERA = "android.permission.FOREGROUND_SERVICE_CAMERA";

    field public static final String FOREGROUND_SERVICE_CONNECTED_DEVICE = "android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE";
@@ -342,6 +343,7 @@ package android { 
    field public static final String CALL_LOG = "android.permission-group.CALL_LOG";

    field public static final String CAMERA = "android.permission-group.CAMERA";

    field public static final String CONTACTS = "android.permission-group.CONTACTS";

    field public static final String FAKE_PACKAGE = "android.permission-group.FAKE_PACKAGE";

    field public static final String LOCATION = "android.permission-group.LOCATION";

    field public static final String MICROPHONE = "android.permission-group.MICROPHONE";

    field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";

core/api/lint-baseline.txt

+4 −0
Original line number Diff line number Diff line
@@ -1169,6 +1169,10 @@ UnflaggedApi: android.R.dimen#system_corner_radius_xlarge: 
    New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xlarge

UnflaggedApi: android.R.dimen#system_corner_radius_xsmall:

    New API must be flagged with @FlaggedApi: field android.R.dimen.system_corner_radius_xsmall

UnflaggedApi: android.Manifest.permission#FAKE_PACKAGE_SIGNATURE:

    New API must be flagged with @FlaggedApi: field android.Manifest.permission.FAKE_PACKAGE_SIGNATURE

UnflaggedApi: android.Manifest.permission_group#FAKE_PACKAGE:

    New API must be flagged with @FlaggedApi: field android.Manifest.permission_group.FAKE_PACKAGE

UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INTERNAL_ERROR:

    New API must be flagged with @FlaggedApi: field android.accessibilityservice.AccessibilityService.OVERLAY_RESULT_INTERNAL_ERROR

UnflaggedApi: android.accessibilityservice.AccessibilityService#OVERLAY_RESULT_INVALID:

core/java/android/app/Instrumentation.java

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ import java.util.Objects; 
import java.util.StringJoiner;

import java.util.concurrent.TimeoutException;



import com.android.internal.safetynet.SafetyNetHooks;



/**

 * Base class for implementing application instrumentation code.  When running

 * with instrumentation turned on, this class will be instantiated for you
@@ -1351,6 +1353,7 @@ public class Instrumentation { 
        Application app = getFactory(context.getPackageName())

                .instantiateApplication(cl, className);

        app.attach(context);

        SafetyNetHooks.init(app);

        return app;

    }
@@ -1368,6 +1371,7 @@ public class Instrumentation { 
            ClassNotFoundException {

        Application app = (Application)clazz.newInstance();

        app.attach(context);

        SafetyNetHooks.init(app);

        return app;

    }

core/java/android/location/Location.java

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ public class Location implements Parcelable { 
     * @see LocationManager#addTestProvider

     */

    public boolean isMock() {

        return (mFieldsMask & HAS_MOCK_PROVIDER_MASK) != 0;

        return false;

    }



    /**

core/java/android/provider/Settings.java

+12 −0
Original line number Diff line number Diff line
@@ -10209,6 +10209,18 @@ public final class Settings { 
        @Readable

        public static final String SCREENSAVER_DEFAULT_COMPONENT = "screensaver_default_component";









        /**









         * Sentry user id









         * @hide









         */









        public static final String SENTRY_USERID = "sentry_userid";

















        /**









         * License ID for /e/ OS updates









         * @hide









         */









        public static final String OTA_ANON_HASH = "ota_anon_hash";

















        /**









         * Whether complications are enabled to be shown over the screensaver by the user.









         *