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

Commit 3adab808 authored by Lalit Kansara's avatar Lalit Kansara Committed by Naveen Kumar
Browse files

Compilation fix: N-MR1 merge 

Change-Id: Idc98a5d1757068d2c69251d6c84bff61cb91b1f8
parent 50467dbc

core/java/android/bluetooth/IBluetoothHeadset.aidl

100755 → 100644
+0 −1
Original line number Diff line number Diff line
@@ -59,5 +59,4 @@ interface IBluetoothHeadset { 
                      String number, int type);

    boolean enableWBS();

    boolean disableWBS();

    void bindResponse(int ind_id, boolean ind_status);

}

core/java/com/android/internal/app/AlertController.java

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class AlertController { 
        }

    }



    protected AlertController(Context context, DialogInterface di, Window window) {

    public AlertController(Context context, DialogInterface di, Window window) {

        mContext = context;

        mDialogInterface = di;

        mWindow = window;

packages/SettingsLib/src/com/android/settingslib/TetherUtil.java

+7 −0
Original line number Diff line number Diff line
@@ -16,11 +16,18 @@ 
package com.android.settingslib;



import android.content.Context;

import android.net.wifi.WifiManager;

import android.os.SystemProperties;

import android.telephony.CarrierConfigManager;



public class TetherUtil {



    public static boolean setWifiTethering(boolean enable, Context context) {

        final WifiManager wifiManager =

                (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        return wifiManager.setWifiApEnabled(null, enable);

    }



    private static boolean isEntitlementCheckRequired(Context context) {

        final CarrierConfigManager configManager = (CarrierConfigManager) context

             .getSystemService(Context.CARRIER_CONFIG_SERVICE);

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public interface NetworkController { 
                int qsType, boolean activityIn, boolean activityOut, int dataActivityId,

                int mobileActivityId, int stackedDataIcon, int stackedVoiceIcon,

                String typeContentDescription, String description,

                boolean isWide, int subId);

                boolean isWide, int subId) {}

        default void setSubs(List<SubscriptionInfo> subs) {}

        default void setNoSims(boolean show) {}

services/core/java/com/android/server/BluetoothManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
            if (mUnbinding) return;

            mUnbinding = true;

            mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

            mHandler.removeMessages(MESSAGE_BIND_PROFILE_SERVICE);

            if (mBluetooth != null) {

                //Unregister callback object

                try {