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

Commit 591b7be8 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-5.1.0_r3' of https://android.googlesource.com/platform/frameworks/base into HEAD 

Android 5.1.0 release 3

Change-Id: I27c4c39a3c3b81354bbb00bc442c1ef95e333c83
parents 848fe219 0590e4e5

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -5336,7 +5336,6 @@ package android.app.admin { 
    method public boolean getScreenCaptureDisabled(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);

    method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);

    method public boolean hasGrantedPolicy(android.content.ComponentName, int);

    method public boolean installCaCert(android.content.ComponentName, byte[]);
@@ -5385,7 +5384,6 @@ package android.app.admin { 
    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);

    method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);

    method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);

    method public void uninstallAllUserCaCerts(android.content.ComponentName);

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -5469,7 +5469,6 @@ package android.app.admin { 
    method public boolean getScreenCaptureDisabled(android.content.ComponentName);

    method public boolean getStorageEncryption(android.content.ComponentName);

    method public int getStorageEncryptionStatus();

    method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);

    method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);

    method public boolean hasGrantedPolicy(android.content.ComponentName, int);

    method public boolean installCaCert(android.content.ComponentName, byte[]);
@@ -5519,7 +5518,6 @@ package android.app.admin { 
    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);

    method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);

    method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);

    method public void uninstallAllUserCaCerts(android.content.ComponentName);

core/java/android/app/admin/DevicePolicyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -2698,6 +2698,7 @@ public class DevicePolicyManager { 
     * <p>If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all admins,

     * then it's up to the TrustAgent itself to aggregate the values from all device admins.

     * <p>Consult documentation for the specific TrustAgent to determine legal options parameters.

     * @hide

     */

    public void setTrustAgentConfiguration(ComponentName admin, ComponentName target,

            PersistableBundle configuration) {
@@ -2724,6 +2725,7 @@ public class DevicePolicyManager { 
     * for this {@param agent} or calls it with a null configuration, null is returned.

     * @param agent Which component to get enabled features for.

     * @return configuration for the given trust agent.

     * @hide

     */

    public List<PersistableBundle> getTrustAgentConfiguration(ComponentName admin,

            ComponentName agent) {

packages/Keyguard/res/layout/keyguard_password_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
             android:layout_height="wrap_content"

             android:layout_marginBottom="12dp"

             android:src="@drawable/ic_lockscreen_ime"

             android:contentDescription="@string/accessibility_ime_switch_button"

             android:clickable="true"

             android:padding="8dip"

             android:layout_gravity="end|center_vertical"

packages/Keyguard/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -449,4 +449,7 @@ 
        This will erase all data from your device\'s internal storage and your device will be back to factory settings.

    </string>



    <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Switch input method button.</string>



</resources>