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

Commit 1ccd57a9 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge commit '22e01d56'

parents 57d161fa 22e01d56

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40096,6 +40096,7 @@ package android.util { 
    method public int describeContents();

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public java.util.Locale get(int);

    method public static android.util.LocaleList getAdjustedDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public java.util.Locale getFirstMatch(java.lang.String[]);

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -10190,6 +10190,8 @@ package android.content.pm { 
    field public static final int INSTALL_PARSE_FAILED_NO_CERTIFICATES = -103; // 0xffffff99

    field public static final int INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION = -102; // 0xffffff9a

    field public static final int INSTALL_SUCCEEDED = 1; // 0x1

    field public static final int INTENT_FILTER_VERIFICATION_FAILURE = -1; // 0xffffffff

    field public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; // 0x1

    field public static final int MASK_PERMISSION_FLAGS = 255; // 0xff

    field public static final int MATCH_ALL = 131072; // 0x20000

    field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
@@ -42861,6 +42863,7 @@ package android.util { 
    method public int describeContents();

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public java.util.Locale get(int);

    method public static android.util.LocaleList getAdjustedDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public java.util.Locale getFirstMatch(java.lang.String[]);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40115,6 +40115,7 @@ package android.util { 
    method public int describeContents();

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public java.util.Locale get(int);

    method public static android.util.LocaleList getAdjustedDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public java.util.Locale getFirstMatch(java.lang.String[]);

cmds/am/src/com/android/commands/am/Am.java

+4 −4
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ public class Am extends BaseCommand { 
                            new File(mProfileFile),

                            ParcelFileDescriptor.MODE_CREATE |

                            ParcelFileDescriptor.MODE_TRUNCATE |

                            ParcelFileDescriptor.MODE_READ_WRITE);

                            ParcelFileDescriptor.MODE_WRITE_ONLY);

                } catch (FileNotFoundException e) {

                    System.err.println("Error: Unable to open file: " + mProfileFile);

                    System.err.println("Consider using a file under /data/local/tmp/");
@@ -903,7 +903,7 @@ public class Am extends BaseCommand { 
            fd = openForSystemServer(file,

                    ParcelFileDescriptor.MODE_CREATE |

                            ParcelFileDescriptor.MODE_TRUNCATE |

                            ParcelFileDescriptor.MODE_READ_WRITE);

                            ParcelFileDescriptor.MODE_WRITE_ONLY);

        } catch (FileNotFoundException e) {

            System.err.println("Error: Unable to open file: " + filename);

            System.err.println("Consider using a file under /data/local/tmp/");
@@ -992,7 +992,7 @@ public class Am extends BaseCommand { 
                        new File(profileFile),

                        ParcelFileDescriptor.MODE_CREATE |

                        ParcelFileDescriptor.MODE_TRUNCATE |

                        ParcelFileDescriptor.MODE_READ_WRITE);

                        ParcelFileDescriptor.MODE_WRITE_ONLY);

            } catch (FileNotFoundException e) {

                System.err.println("Error: Unable to open file: " + profileFile);

                System.err.println("Consider using a file under /data/local/tmp/");
@@ -1052,7 +1052,7 @@ public class Am extends BaseCommand { 
            fd = openForSystemServer(file,

                    ParcelFileDescriptor.MODE_CREATE |

                    ParcelFileDescriptor.MODE_TRUNCATE |

                    ParcelFileDescriptor.MODE_READ_WRITE);

                    ParcelFileDescriptor.MODE_WRITE_ONLY);

        } catch (FileNotFoundException e) {

            System.err.println("Error: Unable to open file: " + heapFile);

            System.err.println("Consider using a file under /data/local/tmp/");

core/java/android/animation/AnimatorInflater.java

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class AnimatorInflater { 
            float pathErrorScale) throws NotFoundException {

        final ConfigurationBoundResourceCache<Animator> animatorCache = resources

                .getAnimatorCache();

        Animator animator = animatorCache.getInstance(id, theme);

        Animator animator = animatorCache.getInstance(id, resources, theme);

        if (animator != null) {

            if (DBG_ANIMATOR_INFLATER) {

                Log.d(TAG, "loaded animator from cache, " + resources.getResourceName(id));
@@ -157,7 +157,7 @@ public class AnimatorInflater { 
        final ConfigurationBoundResourceCache<StateListAnimator> cache = resources

                .getStateListAnimatorCache();

        final Theme theme = context.getTheme();

        StateListAnimator animator = cache.getInstance(id, theme);

        StateListAnimator animator = cache.getInstance(id, resources, theme);

        if (animator != null) {

            return animator;

        }