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

Commit c88a1919 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Settings recovery support"

parents 8ab67096 aa316974

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -35755,6 +35755,8 @@ package android.provider { 
    method public static boolean putInt(android.content.ContentResolver, java.lang.String, int);

    method public static boolean putLong(android.content.ContentResolver, java.lang.String, long);

    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String);

    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String, boolean);

    method public static void resetToDefaults(android.content.ContentResolver, java.lang.String);

    field public static final java.lang.String ADB_ENABLED = "adb_enabled";

    field public static final java.lang.String AIRPLANE_MODE_ON = "airplane_mode_on";

    field public static final java.lang.String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
@@ -35828,6 +35830,8 @@ package android.provider { 
    method public static boolean putInt(android.content.ContentResolver, java.lang.String, int);

    method public static boolean putLong(android.content.ContentResolver, java.lang.String, long);

    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String);

    method public static boolean putString(android.content.ContentResolver, java.lang.String, java.lang.String, java.lang.String, boolean);

    method public static void resetToDefaults(android.content.ContentResolver, java.lang.String);

    method public static final deprecated void setLocationProviderEnabled(android.content.ContentResolver, java.lang.String, boolean);

    field public static final java.lang.String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED = "accessibility_display_inversion_enabled";

    field public static final java.lang.String ACCESSIBILITY_ENABLED = "accessibility_enabled";

core/java/android/content/pm/PackageManagerInternal.java

+5 −0
Original line number Diff line number Diff line
@@ -221,4 +221,9 @@ public abstract class PackageManagerInternal { 
    public abstract void requestEphemeralResolutionPhaseTwo(EphemeralResponse responseObj,

            Intent origIntent, String resolvedType, Intent launchIntent, String callingPackage,

            int userId);



    /**

     * @return The SetupWizard package name.

     */

    public abstract String getSetupWizardPackageName();

}

core/java/android/provider/Settings.java

+360 −33

File changed.

Preview size limit exceeded, changes collapsed.

packages/SettingsProvider/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-subdir-java-files) \

LOCAL_SRC_FILES := $(call all-java-files-under, src) \

    src/com/android/providers/settings/EventLogTags.logtags



LOCAL_JAVA_LIBRARIES := telephony-common ims-common

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+321 −123

File changed.

Preview size limit exceeded, changes collapsed.