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

Commit 9824c5da authored by Jason Monk's avatar Jason Monk
Browse files

resolved conflicts for merge of 1adca55f to mnc-dr-dev 

Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
parents 2e3775b9 1adca55f

res/values/arrays.xml

+0 −8
Original line number Diff line number Diff line
@@ -1389,12 +1389,4 @@ 
        <item>0</item>

    </string-array>



    <!-- These values must match up with the code in UsbModeChooserActivity.java. -->

    <string-array name="usb_available_functions">

        <item>@string/usb_use_charging_only</item>

        <item>@string/usb_use_file_transfers</item>

        <item>@string/usb_use_photo_transfers</item>

        <item>@string/usb_use_MIDI</item>

    </string-array>



</resources>

src/com/android/settings/deviceinfo/UsbBackend.java

+11 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.settings.deviceinfo;



import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.hardware.usb.UsbManager;

import android.hardware.usb.UsbPort;

import android.hardware.usb.UsbPortStatus;
@@ -40,7 +42,13 @@ public class UsbBackend { 
    private UsbPort mPort;

    private UsbPortStatus mPortStatus;



    private boolean mIsUnlocked;



    public UsbBackend(Context context) {

        Intent intent = context.registerReceiver(null,

                new IntentFilter(UsbManager.ACTION_USB_STATE));

        mIsUnlocked = intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);



        mUserManager = UserManager.get(context);

        mUsbManager = context.getSystemService(UsbManager.class);
@@ -70,7 +78,7 @@ public class UsbBackend { 
    }



    public int getUsbDataMode() {

        if (!mUsbManager.isUsbDataUnlocked()) {

        if (!mIsUnlocked) {

            return MODE_DATA_NONE;

        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {

            return MODE_DATA_MTP;
@@ -123,7 +131,8 @@ public class UsbBackend { 
    }



    public boolean isModeSupported(int mode) {

        if (mRestricted && (mode & MODE_DATA_MASK) != MODE_DATA_NONE) {

        if (mRestricted && (mode & MODE_DATA_MASK) != MODE_DATA_NONE

                && (mode & MODE_DATA_MASK) != MODE_DATA_MIDI) {

            // No USB data modes are supported.

            return false;

        }

src/com/android/settings/deviceinfo/UsbModeChooserActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ public class UsbModeChooserActivity extends Activity { 


    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {



        super.onCreate(savedInstanceState);



        mLayoutInflater = LayoutInflater.from(this);