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

Commit 10688619 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix some spelling issues from the editable permissions commit." into gingerbread

parents ea7fd5bf e54bfb27

core/java/android/widget/AppSecurityEditablePermissions.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ public class AppSecurityEditablePermissions extends AppSecurityPermissionsBase{ 
        try {

        try {

            pkgInfo = mPm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);

            pkgInfo = mPm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);

        } catch (NameNotFoundException e) {

        } catch (NameNotFoundException e) {

            Log.w(TAG, "Could'nt retrieve permissions for package:"+packageName);

            Log.w(TAG, "Couldn't retrieve permissions for package:"+packageName);

            return;

            return;

        }

        }

        // Extract all user permissions

        // Extract all user permissions
@@ -159,7 +159,7 @@ public class AppSecurityEditablePermissions extends AppSecurityPermissionsBase{ 
        try {

        try {

            pkgInfo = mPm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);

            pkgInfo = mPm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);

        } catch (NameNotFoundException e) {

        } catch (NameNotFoundException e) {

            Log.w(TAG, "Could'nt retrieve permissions for package:"+packageName);

            Log.w(TAG, "Couldn't retrieve permissions for package:"+packageName);

            return;

            return;

        }

        }

        if ((pkgInfo != null) && (pkgInfo.requestedPermissions != null)) {

        if ((pkgInfo != null) && (pkgInfo.requestedPermissions != null)) {

core/res/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -1279,7 +1279,7 @@ 
        android:description="@string/permlab_copyProtectedData"

        android:description="@string/permlab_copyProtectedData"

        android:protectionLevel="signature" />

        android:protectionLevel="signature" />





    <!-- Permission for reading writeing revoked permissions

    <!-- Permission for reading writing revoked permissions

         @hide -->

         @hide -->

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

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

        android:label="@string/permlab_revokePermissions"

        android:label="@string/permlab_revokePermissions"

core/res/res/values/config.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -408,7 +408,7 @@ 
    <!-- Configure lense unlock time label offset -->

    <!-- Configure lense unlock time label offset -->

    <integer name="config_lenseTimeLabelOffsetDIP">0</integer>

    <integer name="config_lenseTimeLabelOffsetDIP">0</integer>





    <!-- Enable mermissions managment -->

    <!-- Enable permissions management -->

    <bool name="config_enablePermissionsManagment">false</bool>

    <bool name="config_enablePermissionsManagment">false</bool>





    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->

    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->

core/res/res/values/strings.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -1999,10 +1999,10 @@ 
        stopped unexpectedly. Please try again.</string>

        stopped unexpectedly. Please try again.</string>

    <!-- Title of the alert when an application is not responding. -->

    <!-- Title of the alert when an application is not responding. -->

    <string name="aerr_revoked_application">The application <xliff:g id="application">%1$s</xliff:g>

    <string name="aerr_revoked_application">The application <xliff:g id="application">%1$s</xliff:g>

        (process <xliff:g id="process">%2$s</xliff:g>) has stopped unexpectedly.\nWARNING!\nThis application has one or more of its permissions REVOKED which may couse it to malfunction. Please grant its permissions and try again.</string>

        (process <xliff:g id="process">%2$s</xliff:g>) has stopped unexpectedly.\nWARNING!\nThis application has one or more of its permissions REVOKED which may cause it to malfunction. Please grant its permissions and try again.</string>

    <!-- Text of the alert that is displayed when an application has crashed. -->

    <!-- Text of the alert that is displayed when an application has crashed. -->

    <string name="aerr_revoked_process">The process <xliff:g id="process">%1$s</xliff:g> has

    <string name="aerr_revoked_process">The process <xliff:g id="process">%1$s</xliff:g> has

        stopped unexpectedly.\nWARINIG!\nThis process has one or more of its permissions REVOKED which may couse it to malfunction. Please grant its permissions and try again.</string>

        stopped unexpectedly.\nWARNING!\nThis process has one or more of its permissions REVOKED which may cause it to malfunction. Please grant its permissions and try again.</string>

    <!-- Title of the alert when an application is not responding. -->

    <!-- Title of the alert when an application is not responding. -->

    <string name="anr_title">Sorry!</string>

    <string name="anr_title">Sorry!</string>

    <!-- Text of the alert that is displayed when an application is not responding. -->

    <!-- Text of the alert that is displayed when an application is not responding. -->