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

Commit 8b634e91 authored by Bill Yi's avatar Bill Yi
Browse files

Merge pie-platform-release to aosp-master - DO NOT MERGE 

Change-Id: I695db52f5e22509401258e8b083e7650d401d993
parents 1e8249a1 cd9440cc

config/hiddenapi-private-dex.txt

0 → 100644
+141736 −0

File added.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-public-dex.txt

0 → 100644
+74841 −0

File added.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-removed-dex.txt

0 → 100644
+348 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/database/sqlite/SQLiteDatabase.java

+2 −1
Original line number Diff line number Diff line
@@ -1757,7 +1757,8 @@ public final class SQLiteDatabase extends SQLiteClosable { 
        executeSql(sql, bindArgs);

    }



    private int executeSql(String sql, Object[] bindArgs) throws SQLException {

    /** {@hide} */

    public int executeSql(String sql, Object[] bindArgs) throws SQLException {

        acquireReference();

        try {

            final int statementType = DatabaseUtils.getSqlStatementType(sql);

core/java/android/text/Layout.java

+2 −1
Original line number Diff line number Diff line
@@ -1590,7 +1590,8 @@ public abstract class Layout { 
        }



        float get(final int offset) {

            if (mHorizontals == null) {

            if (mHorizontals == null || offset < mLineStartOffset

                    || offset >= mLineStartOffset + mHorizontals.length) {

                return getHorizontal(offset, mPrimary);

            } else {

                return mHorizontals[offset - mLineStartOffset];