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

Commit befb7888 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge remote-tracking branch 'github/cm-11.0' into HEAD

parents 1cf716c7 1fe59c87

core/java/android/provider/Settings.java

+14 −0
Original line number Diff line number Diff line
@@ -2814,6 +2814,20 @@ public final class Settings { 
         */

        public static final String REVERSE_LOOKUP_PROVIDER = "reverse_lookup_provider";



        /**

         * The OpenCNAM paid account ID

         *

         * @hide

         */

        public static final String DIALER_OPENCNAM_ACCOUNT_SID = "dialer_opencnam_account_sid";



        /**

         * The OpenCNAM authentication token

         *

         * @hide

         */

        public static final String DIALER_OPENCNAM_AUTH_TOKEN = "dialer_opencnam_auth_token";



        /**

         * Quick Settings Panel Dynamic Tiles

         *

core/java/android/view/TextureView.java

+6 −0
Original line number Diff line number Diff line
@@ -743,6 +743,12 @@ public class TextureView extends View { 
            mSurface.release();

        }

        mSurface = surfaceTexture;



        // If the view is visible, update the listener in the new surface to use

        // the existing listener in the view.

        if (((mViewFlags & VISIBILITY_MASK) == VISIBLE)) {

            mSurface.setOnFrameAvailableListener(mUpdateListener);

        }

        mUpdateSurface = true;

        invalidateParentIfNeeded();

    }

core/jni/android/graphics/Paint.cpp

+7 −2
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ public: 
                return 0;

            }

        }

        jfloat advancesArray[count];

        jfloat *advancesArray = new jfloat[count];

        jfloat totalAdvance = 0;



        TextLayout::getTextRunAdvances(paint, text, start, count, contextCount, flags,
@@ -574,6 +574,9 @@ public: 
        if (advances != NULL) {

            env->SetFloatArrayRegion(advances, advancesIndex, count, advancesArray);

        }



        delete [] advancesArray;



        return totalAdvance;

    }
@@ -600,7 +603,7 @@ public: 


    static jint doTextRunCursor(JNIEnv *env, SkPaint* paint, const jchar *text, jint start,

            jint count, jint flags, jint offset, jint opt) {

        jfloat scalarArray[count];

        jfloat *scalarArray = new jfloat[count];



        TextLayout::getTextRunAdvances(paint, text, start, count, start + count, flags,

                scalarArray, NULL /* dont need totalAdvance */);
@@ -639,6 +642,8 @@ public: 
          pos += start;

        }



        delete [] scalarArray;



        return pos;

    }

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ 
    <!-- Allows an application to read or write the system settings. -->

    <permission android:name="android.permission.WRITE_SETTINGS"

        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

        android:protectionLevel="normal"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_writeSettings"

        android:description="@string/permdesc_writeSettings" />

core/res/res/values-af/cm_strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -67,6 +67,14 @@ 
  <string name="permdesc_interceptSmsSent">Laat \'n program toe om uitgaande SMS boodskappe te onderskep. Kwaadwillige programme kan die reg misbruik om uitgaande SMS boodskappe te verhoed.</string>

  <string name="permlab_resetBatteryStats">battery statistieke terugstel</string>

  <string name="permdesc_resetBatteryStats">Laat \'n program om die huidige lae-vlak battery gebruik data terugtestel.</string>

  <string name="permgrouplab_security">Sekuriteit</string>

  <string name="permgroupdesc_security">Regte met betrekking tot toestel sekuriteitsinligting.</string>

  <string name="permlab_readPhoneBlacklist">lees foon swartlys</string>

  <string name="permdesc_readPhoneBlacklist">Laat \'n program toe om inligting oor telefoonnommers wat geblokkeer is van inkomende oproepe of boodskappe te lees.</string>

  <string name="permlab_changePhoneBlacklist">Verander selfoon swartlys</string>

  <string name="permdesc_changePhoneBlacklist">Laat \'n program toe om van die telefoonnommers wat geblokkeer is vir inkomende oproepe of boodskappe te verander.</string>

  <string name="permlab_accessThemeService">Toegang tot tema diens</string>

  <string name="permdesc_accessThemeService">Laat \'n program toe om toegang na die tema diens te verkry. Moet nooit nodig wees vir normale programme nie.</string>

  <string name="immersive_mode_confirmation_bottom">Skyf van die onderkant om vol skerm toe te maak.</string>

  <string name="app_ops_access_camera">toegang tot die kamera</string>

  <string name="app_ops_access_location">toegang tot jou ligging</string>