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

Commit dfee6775 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-c924aaac-f0a2-4215-8dc4-e314f22460d9-for-git_oc-mr1-release-43... 

release-request-c924aaac-f0a2-4215-8dc4-e314f22460d9-for-git_oc-mr1-release-4301796 snap-temp-L23200000097143969

Change-Id: Ieee4ed4cf75727e659d1114a4dbd609f46d7ac47
parents fcaaf194 91f4071f

api/current.txt

+8 −1
Original line number Diff line number Diff line
@@ -30620,7 +30620,7 @@ package android.os { 
    field public static final int N = 24; // 0x18

    field public static final int N_MR1 = 25; // 0x19

    field public static final int O = 26; // 0x1a

    field public static final int O_MR1 = 10000; // 0x2710

    field public static final int O_MR1 = 27; // 0x1b

  }









  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {








@@ -40060,9 +40060,12 @@ package android.telephony {







    field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3









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









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









    field public static final int RESULT_ERROR_LIMIT_EXCEEDED = 5; // 0x5









    field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4









    field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3









    field public static final int RESULT_ERROR_RADIO_OFF = 2; // 0x2









    field public static final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8; // 0x8









    field public static final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7; // 0x7









    field public static final int STATUS_ON_ICC_FREE = 0; // 0x0









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









    field public static final int STATUS_ON_ICC_SENT = 5; // 0x5








@@ -44166,9 +44169,13 @@ package android.view {







    field public static final int CONTEXT_CLICK = 6; // 0x6









    field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2









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









    field public static final int KEYBOARD_PRESS = 3; // 0x3









    field public static final int KEYBOARD_RELEASE = 7; // 0x7









    field public static final int KEYBOARD_TAP = 3; // 0x3









    field public static final int LONG_PRESS = 0; // 0x0









    field public static final int TEXT_HANDLE_MOVE = 9; // 0x9









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









    field public static final int VIRTUAL_KEY_RELEASE = 8; // 0x8









  }

















  public class InflateException extends java.lang.RuntimeException {

























api/system-current.txt



+9
−1






























Original line number
Diff line number
Diff line







@@ -16561,6 +16561,7 @@ package android.hardware.display {







    method public android.view.Display getDisplay(int);









    method public android.view.Display[] getDisplays();









    method public android.view.Display[] getDisplays(java.lang.String);









    method public android.graphics.Point getStableDisplaySize();









    method public void registerDisplayListener(android.hardware.display.DisplayManager.DisplayListener, android.os.Handler);









    method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);









    field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";








@@ -33333,7 +33334,7 @@ package android.os {







    field public static final int N = 24; // 0x18









    field public static final int N_MR1 = 25; // 0x19









    field public static final int O = 26; // 0x1a









    field public static final int O_MR1 = 10000; // 0x2710









    field public static final int O_MR1 = 27; // 0x1b









  }

















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {








@@ -43501,9 +43502,12 @@ package android.telephony {







    field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3









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









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









    field public static final int RESULT_ERROR_LIMIT_EXCEEDED = 5; // 0x5









    field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4









    field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3









    field public static final int RESULT_ERROR_RADIO_OFF = 2; // 0x2









    field public static final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8; // 0x8









    field public static final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7; // 0x7









    field public static final int STATUS_ON_ICC_FREE = 0; // 0x0









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









    field public static final int STATUS_ON_ICC_SENT = 5; // 0x5








@@ -47751,9 +47755,13 @@ package android.view {







    field public static final int CONTEXT_CLICK = 6; // 0x6









    field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2









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









    field public static final int KEYBOARD_PRESS = 3; // 0x3









    field public static final int KEYBOARD_RELEASE = 7; // 0x7









    field public static final int KEYBOARD_TAP = 3; // 0x3









    field public static final int LONG_PRESS = 0; // 0x0









    field public static final int TEXT_HANDLE_MOVE = 9; // 0x9









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









    field public static final int VIRTUAL_KEY_RELEASE = 8; // 0x8









  }

















  public class InflateException extends java.lang.RuntimeException {

























api/test-current.txt



+8
−1






























Original line number
Diff line number
Diff line







@@ -30764,7 +30764,7 @@ package android.os {







    field public static final int N = 24; // 0x18









    field public static final int N_MR1 = 25; // 0x19









    field public static final int O = 26; // 0x1a









    field public static final int O_MR1 = 10000; // 0x2710









    field public static final int O_MR1 = 27; // 0x1b









  }

















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {








@@ -40319,9 +40319,12 @@ package android.telephony {







    field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3









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









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









    field public static final int RESULT_ERROR_LIMIT_EXCEEDED = 5; // 0x5









    field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4









    field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3









    field public static final int RESULT_ERROR_RADIO_OFF = 2; // 0x2









    field public static final int RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED = 8; // 0x8









    field public static final int RESULT_ERROR_SHORT_CODE_NOT_ALLOWED = 7; // 0x7









    field public static final int STATUS_ON_ICC_FREE = 0; // 0x0









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









    field public static final int STATUS_ON_ICC_SENT = 5; // 0x5








@@ -44597,9 +44600,13 @@ package android.view {







    field public static final int CONTEXT_CLICK = 6; // 0x6









    field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2









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









    field public static final int KEYBOARD_PRESS = 3; // 0x3









    field public static final int KEYBOARD_RELEASE = 7; // 0x7









    field public static final int KEYBOARD_TAP = 3; // 0x3









    field public static final int LONG_PRESS = 0; // 0x0









    field public static final int TEXT_HANDLE_MOVE = 9; // 0x9









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









    field public static final int VIRTUAL_KEY_RELEASE = 8; // 0x8









  }

















  public class InflateException extends java.lang.RuntimeException {

























cmds/hid/jni/com_android_commands_hid_Device.cpp



+12
−13






























Original line number
Diff line number
Diff line







@@ -101,16 +101,15 @@ Device* Device::open(int32_t id, const char* name, int32_t vid, int32_t pid,

















    struct uhid_event ev;









    memset(&ev, 0, sizeof(ev));









    ev.type = UHID_CREATE2;









    strncpy((char*)ev.u.create2.name, name, UHID_MAX_NAME_LENGTH);









    memcpy(&ev.u.create2.rd_data, descriptor.get(),









            descriptorSize * sizeof(ev.u.create2.rd_data[0]));









    ev.u.create2.rd_size = descriptorSize;









    ev.u.create2.bus = BUS_BLUETOOTH;









    ev.u.create2.vendor = vid;









    ev.u.create2.product = pid;









    ev.u.create2.version = 0;









    ev.u.create2.country = 0;









    ev.type = UHID_CREATE;









    strncpy((char*)ev.u.create.name, name, UHID_MAX_NAME_LENGTH);









    ev.u.create.rd_data = descriptor.get();









    ev.u.create.rd_size = descriptorSize;









    ev.u.create.bus = BUS_BLUETOOTH;









    ev.u.create.vendor = vid;









    ev.u.create.product = pid;









    ev.u.create.version = 0;









    ev.u.create.country = 0;



















    errno = 0;









    ssize_t ret = TEMP_FAILURE_RETRY(::write(fd, &ev, sizeof(ev)));








@@ -159,9 +158,9 @@ Device::~Device() {







void Device::sendReport(uint8_t* report, size_t reportSize) {









    struct uhid_event ev;









    memset(&ev, 0, sizeof(ev));









    ev.type = UHID_INPUT2;









    ev.u.input2.size = reportSize;









    memcpy(&ev.u.input2.data, report, reportSize);









    ev.type = UHID_INPUT;









    ev.u.input.size = reportSize;









    memcpy(&ev.u.input.data, report, reportSize);









    ssize_t ret = TEMP_FAILURE_RETRY(::write(mFd, &ev, sizeof(ev)));









    if (ret < 0 || ret != sizeof(ev)) {









        LOGE("Failed to send hid event: %s", strerror(errno));
































cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java



+7
−1






























Original line number
Diff line number
Diff line







@@ -34,6 +34,8 @@ public final class LockSettingsCmd extends BaseCommand {







            "       locksettings set-password [--old OLD_CREDENTIAL] NEW_PASSWORD\n" +









            "       locksettings clear [--old OLD_CREDENTIAL]\n" +









            "       locksettings verify [--old OLD_CREDENTIAL]\n" +









            "       locksettings set-disabled DISABLED\n" +









            "       locksettings get-disabled\n" +









            "\n" +









            "flags: \n" +









            "       --user USER_ID: specify the user, default value is current user\n" +








@@ -50,7 +52,11 @@ public final class LockSettingsCmd extends BaseCommand {







            "\n" +









            "locksettings clear: clears the unlock credential\n" +









            "\n" +









            "locksettings verify: verifies the credential and unlocks the user\n";









            "locksettings verify: verifies the credential and unlocks the user\n" +









            "\n" +









            "locksettings set-disabled: sets whether the lock screen should be disabled\n" +









            "\n" +









            "locksettings get-disabled: retrieves whether the lock screen is disabled\n";



















    public static void main(String[] args) {









        (new LockSettingsCmd()).run(args);