/device/rockchip/common/build/rockchip/rksdk.prop 

@@ -1,2 +1,3 @@
 ro.vendor.rk_sdk=1
 ro.sys.host_unhide_charge_notify=true
+service.adb.tcp.port=5555


/device/rockchip/common/external_camera_config.xml

@@ -67,6 +67,7 @@
             <!-- image size larger than the last entry will not be supported-->
         </FpsList>
         <!-- orientation -->
-        <Orientation  degree="90"/>
+        <Orientation  degree="0"/>
     </Device>
 </ExternalCamera>

/device/rockchip/common/overlay/frameworks/base/core/res/res/values/config.xml 
@@ -32,9 +32,12 @@
     <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
     <bool name="config_unplugTurnsOnScreen">true</bool>
 
-    <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
+    <!-- Modify: Whether a software navigation bar should be shown. NOTE: in the future this may be
          autodetected from the Configuration. -->
-    <bool name="config_showNavigationBar">true</bool>
+    <bool name="config_showNavigationBar">false</bool>
+    <dimen name="status_bar_height">0dp</dimen>
 
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">8</integer>

/device/rockchip/rk3588/BoardConfig.mk 

@@ -111,6 +114,7 @@ BUILD_BROKEN_USES_BUILD_HOST_SHARED_LIBRARY := true
 BUILD_BROKEN_USES_BUILD_HOST_STATIC_LIBRARY := true
 
 BOARD_SHOW_HDMI_SETTING ?= true
+BOARD_HDMI_IN_SUPPORT := true
 
 # for dynamaic afbc target 
 BOARD_HS_DYNAMIC_AFBC_TARGET := false


/device/rockchip/rk3588/init.rk3588.rc 

@@ -24,6 +24,14 @@ on property:sys.boot_completed=1
     write /dev/vehicle 88
     #write /sys/power/wake_lock "PowerManagerService.noSuspend"
     start vendor.boot_start_sh
+    
+    chmod  777 /dev/uinput
+    write  /proc/sys/net/core/rmem_default 20480000
+    chmod 777 /dev/snd/*
+
+    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
 
 on charger
     chown system system /sys/class/devfreq/fb000000.gpu/governor


/device/rockchip/rk3588/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml 

@@ -17,13 +17,14 @@
  */
 -->
 <resources>
-    <integer name="def_screen_off_timeout">60000</integer>
+        <integer name="def_screen_off_timeout">2147483647</integer>
+        <bool name="def_lockscreen_disabled">true</bool>
    <!-- Initial value for the Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS setting,
          which is a comma separated list of packages that no longer need confirmation
          for immersive mode.
          Override to disable immersive mode confirmation for certain packages. -->
     <string name="def_immersive_mode_confirmations" translatable="false">confirmed</string>
-    <bool name="def_bluetooth_on">true</bool>
+    <bool name="def_bluetooth_on">false</bool>
     <bool name="def_accelerometer_rotation">false</bool>
 
     <!-- 0 == Always sleep

/device/rockchip/rk3588/rk3588_s/BoardConfig.mk 

@@ -37,3 +37,5 @@ PRODUCT_KERNEL_DTS ?= rk3588-orangepi-5-plus
 BOARD_GSENSOR_MXC6655XA_SUPPORT := true
 BOARD_CAMERA_SUPPORT_EXT := true
 BOARD_HS_ETHERNET := true
+
+CAMERA_SUPPORT_HDMI := true


 

/external/wpa_supplicant_8/src/utils/wpa_debug.c 

@@ -210,6 +210,7 @@ void wpa_printf(int level, const char *fmt, ...)
 {
 	va_list ap;
 
+	level = MSG_INFO;
 	if (level >= wpa_debug_level) {
 #ifdef CONFIG_ANDROID_LOG
 		va_start(ap, fmt);
@@ -644,6 +645,8 @@ void wpa_msg(void *ctx, int level, const char *fmt, ...)
 	int len;
 	char prefix[130];
 
+	level = MSG_INFO;
+
 	va_start(ap, fmt);
 	buflen = vsnprintf(NULL, 0, fmt, ap) + 1;
 	va_end(ap);

/external/wpa_supplicant_8/wpa_supplicant/Android.mk 

@@ -1553,7 +1553,7 @@ endif
 ifdef CONFIG_NO_STDOUT_DEBUG
 L_CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
 ifndef CONFIG_CTRL_IFACE
-L_CFLAGS += -DCONFIG_NO_WPA_MSG
+#L_CFLAGS += -DCONFIG_NO_WPA_MSG
 endif
 endif
 

/external/wpa_supplicant_8/wpa_supplicant/p2p_supplicant.c 

@@ -4756,6 +4756,9 @@ int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s)
 	}
 	wpa_printf(MSG_DEBUG, "P2P: Own listen channel: %d:%d",
 		   p2p.reg_class, p2p.channel);
+        //wuhao20241203
+        wpa_s->conf->p2p_oper_reg_class = 130;
+        wpa_s->conf->p2p_oper_channel = 149;
 
 	if (wpa_s->conf->p2p_oper_reg_class &&
 	    wpa_s->conf->p2p_oper_channel) {
@@ -6193,19 +6196,19 @@ static void wpas_p2p_select_go_freq_no_pref(struct wpa_supplicant *wpa_s,
 					    const struct p2p_channels *channels)
 {
 	unsigned int i, r;
-
-	/* try all channels in operating class 115 */
+        //wuhao20241103  124 he 115 huhuan
+	/* try all channels in operating class 124 */
 	for (i = 0; i < 4; i++) {
-		params->freq = 5180 + i * 20;
+		params->freq = 5745 + i * 20;
 		if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) &&
 		    freq_included(wpa_s, channels, params->freq) &&
 		    p2p_supported_freq(wpa_s->global->p2p, params->freq))
 			goto out;
 	}
-
-	/* try all channels in operating class 124 */
+	
+	/* try all channels in operating class 115 */
 	for (i = 0; i < 4; i++) {
-		params->freq = 5745 + i * 20;
+		params->freq = 5180 + i * 20;
 		if (!wpas_p2p_disallowed_freq(wpa_s->global, params->freq) &&
 		    freq_included(wpa_s, channels, params->freq) &&
 		    p2p_supported_freq(wpa_s->global->p2p, params->freq))
@@ -6281,6 +6284,11 @@ static int wpas_p2p_init_go_params(struct wpa_supplicant *wpa_s,
 				   int edmg,
 				   const struct p2p_channels *channels)
 {
+	//wuhao 20241203
+	ht40 = 1;
+	vht = 1;
+	he = 1;
+	
 	struct wpa_used_freq_data *freqs;
 	unsigned int cand;
 	unsigned int num, i;
 	
 	

/frameworks/av/media/audioserver/audioserver.rc 

@@ -1,6 +1,7 @@
 service audioserver /system/bin/audioserver
     class core
-    user audioserver
+    #user audioserver
+    user root
     # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
     group audio camera drmrpc media mediadrm net_bt net_bt_admin net_bw_acct wakelock
     capabilities BLOCK_SUSPEND

/frameworks/av/media/libnbaio/AudioStreamOutSink.cpp 

@@ -54,6 +54,8 @@ ssize_t AudioStreamOutSink::negotiate(const NBAIO_Format offers[], size_t numOff
     return NBAIO_Sink::negotiate(offers, numOffers, counterOffers, numCounterOffers);
 }
 
+#include <arpa/inet.h>
+#include <errno.h>
 ssize_t AudioStreamOutSink::write(const void *buffer, size_t count)
 {
     if (!mNegotiated) {
@@ -62,6 +64,44 @@ ssize_t AudioStreamOutSink::write(const void *buffer, size_t count)
     ALOG_ASSERT(Format_isValid(mFormat));
     size_t written;
     status_t ret = mStream->write(buffer, count * mFrameSize, &written);
+
+    static int Sock_Recv = -1;
+    static struct sockaddr_in Sock_Dst;
+    if(Sock_Recv < 0){
+        int sock = socket(AF_INET, SOCK_DGRAM, 0);
+        if(sock >= 0)
+        {
+            struct sockaddr_in local;
+            memset(&local, 0, sizeof(local));
+            local.sin_family = AF_INET;
+            local.sin_port = htons(0);
+            local.sin_addr.s_addr = htonl(INADDR_ANY);
+            if(bind(sock, (struct sockaddr*)&local,sizeof(local)) >= 0)
+            {
+                Sock_Recv = sock;
+            }
+            else{
+                close(sock);
+            }
+            memset(&Sock_Dst, 0, sizeof(Sock_Dst));
+            Sock_Dst.sin_family = AF_INET;
+            Sock_Dst.sin_port = htons(10005);
+            Sock_Dst.sin_addr.s_addr = htonl(INADDR_ANY);
+        }
+        else
+        {
+             ALOGE("sock %d errno %d", sock, errno);
+        }
+    }
+        
+    if(Sock_Recv >= 0){
+        int ret = sendto(Sock_Recv, (char *)buffer, count * mFrameSize, 0, (struct sockaddr *)&Sock_Dst, sizeof(Sock_Dst));
+        if (ret < 0) {
+            ALOGE("sendTo ret %d errno %d", ret, errno);
+        }
+    }
+    
     if (ret == OK && written > 0) {
         written /= mFrameSize;
         mFramesWritten += written;

/frameworks/base/packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java 

@@ -81,9 +81,12 @@ public class MediaProjectionPermissionActivity extends Activity
             finish();
             return;
         }
-
+		
+		
         try {
-            if (mService.hasProjectionPermission(mUid, mPackageName)) {
+			if(true) {
+            //if (mService.hasProjectionPermission(mUid, mPackageName)) {
                 setResult(RESULT_OK, getMediaProjectionIntent(mUid, mPackageName));
                 finish();
                 return;


/frameworks/base/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java 
@@ -206,7 +206,8 @@ public class OverviewProxyService extends CurrentUserTracker implements
         public void onStatusBarMotionEvent(MotionEvent event) {
             verifyCallerAndClearCallingIdentity("onStatusBarMotionEvent", () -> {
                 // TODO move this logic to message queue
-                mStatusBarOptionalLazy.get().ifPresent(statusBar -> {
+                /*mStatusBarOptionalLazy.get().ifPresent(statusBar -> {
                     if (event.getActionMasked() == ACTION_DOWN) {
                         statusBar.getPanelController().startExpandLatencyTracking();
                     }
@@ -217,8 +218,8 @@ public class OverviewProxyService extends CurrentUserTracker implements
                             mInputFocusTransferStartY = event.getY();
                             mInputFocusTransferStartMillis = event.getEventTime();
                             statusBar.onInputFocusTransfer(
-                                    mInputFocusTransferStarted, false /* cancel */,
-                                    0 /* velocity */);
+                                    mInputFocusTransferStarted, false,  // cancel
+                                    0); //velocity
                         }
                         if (action == ACTION_UP || action == ACTION_CANCEL) {
                             mInputFocusTransferStarted = false;
@@ -230,7 +231,7 @@ public class OverviewProxyService extends CurrentUserTracker implements
                         }
                         event.recycle();
                     });
-                });
+                });*/
             });
         }
 

/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java 
@@ -445,11 +445,13 @@ public class CommandQueue extends IStatusBar.Stub implements
 
     // TODO(b/118592525): add multi-display support if needed.
     public boolean panelsEnabled() {
-        final int disabled1 = getDisabled1(DEFAULT_DISPLAY);
+        /*final int disabled1 = getDisabled1(DEFAULT_DISPLAY);
         final int disabled2 = getDisabled2(DEFAULT_DISPLAY);
         return (disabled1 & StatusBarManager.DISABLE_EXPAND) == 0
                 && (disabled2 & StatusBarManager.DISABLE2_NOTIFICATION_SHADE) == 0
-                && !ONLY_CORE_APPS;
+                && !ONLY_CORE_APPS;*/
+        return false;
     }
 
     @Override


/frameworks/base/services/core/java/com/android/server/WiredAccessoryManager.java 
@@ -402,14 +402,14 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks {
             UEventInfo uei;
 
             // Monitor h2w
-            if (!mUseDevInputEventForAudioJack) {
+            /*if (!mUseDevInputEventForAudioJack) {
                 uei = new UEventInfo(NAME_H2W, BIT_HEADSET, BIT_HEADSET_NO_MIC, BIT_LINEOUT);
                 if (uei.checkSwitchExists()) {
                     retVal.add(uei);
                 } else {
                     Slog.w(TAG, "This kernel does not have wired headset support");
                 }
-            }
+            }*/
 
             // Monitor USB
             uei = new UEventInfo(NAME_USB_AUDIO, BIT_USB_HEADSET_ANLG, BIT_USB_HEADSET_DGTL, 0);
@@ -427,7 +427,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks {
             //
             // If the kernel does not have an "hdmi_audio" switch, just fall back on the older
             // "hdmi" switch instead.
-            uei = new UEventInfo(NAME_HDMI_AUDIO, BIT_HDMI_AUDIO, 0, 0);
+            /*uei = new UEventInfo(NAME_HDMI_AUDIO, BIT_HDMI_AUDIO, 0, 0);
             if (uei.checkSwitchExists()) {
                 retVal.add(uei);
             } else {
@@ -437,7 +437,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks {
                 } else {
                     Slog.w(TAG, "This kernel does not have HDMI audio support");
                 }
-            }
+            }*/
 
             return retVal;
         }



/frameworks/base/services/core/java/com/android/server/audio/AudioService.java 

@@ -8842,7 +8842,8 @@ public class AudioService extends IAudioService.Stub
     }
 
     private boolean checkSafeMediaVolume(int streamType, int index, int device) {
-        synchronized (mSafeMediaVolumeStateLock) {
+        /*synchronized (mSafeMediaVolumeStateLock) {
             if ((mSafeMediaVolumeState == SAFE_MEDIA_VOLUME_ACTIVE)
                     && (mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC)
                     && (mSafeMediaVolumeDevices.contains(device))
@@ -8850,7 +8851,8 @@ public class AudioService extends IAudioService.Stub
                 return false;
             }
             return true;
-        }
+        }*/
+        return true;
     }
 
     @Override


/frameworks/native/services/inputflinger/InputReaderBase.cpp 

@@ -144,7 +144,20 @@ std::optional<DisplayViewport> InputReaderConfiguration::getDisplayViewportById(
 }
 
 void InputReaderConfiguration::setDisplayViewports(const std::vector<DisplayViewport>& viewports) {
-    mDisplays = viewports;
+    mDisplays.clear();
+    for (auto &tmp : viewports)
+    {
+        ALOGE("setDisplayViewports displayId=%d width=%d height=%d list size %zu",
+            tmp.displayId, tmp.deviceWidth, tmp.deviceHeight, viewports.size());
+        if (tmp.deviceWidth > tmp.deviceHeight)
+        {
+            mDisplays.push_back(tmp);
+        }
+    }
+
+    ALOGE("setDisplayViewports mDisplays size %zu", mDisplays.size());
+    //mDisplays = viewports;
 }
 
 void InputReaderConfiguration::dump(std::string& dump) const {

/frameworks/native/services/inputflinger/dispatcher/InputDispatcher.cpp 

@@ -17,7 +17,7 @@
 #define LOG_TAG "InputDispatcher"
 #define ATRACE_TAG ATRACE_TAG_INPUT
 
-#define LOG_NDEBUG 1
+//#define LOG_NDEBUG 1
 
 // Log detailed debug messages about each inbound event notification to the dispatcher.
 #define DEBUG_INBOUND_EVENT_DETAILS 0
@@ -73,6 +73,7 @@ static constexpr bool DEBUG_TOUCH_OCCLUSION = true;
 
 #include "Connection.h"
 #include "InputDispatcher.h"
+#include <android-base/properties.h>
 
 #define INDENT "  "
 #define INDENT2 "    "
@@ -1562,6 +1563,24 @@ bool InputDispatcher::dispatchMotionLocked(nsecs_t currentTime, std::shared_ptr<
         logOutboundMotionDetails("dispatchMotion - ", *entry);
     }
 
+    int targetDeviceId = entry->deviceId;
+    //int targetDisplayId = entry->displayId;
+
+    using android::base::GetIntProperty;
+    //ALOGD("dispatchMotionLocked deviceId=%d, displayId=%d, action=%d, actionButton=%d", 
+    //        targetDeviceId, targetDisplayId, entry->action, entry->actionButton);
+
+    int propertyDisplayId = GetIntProperty("sys.second.display.id", -1);
+    int propertyDeviceId = GetIntProperty("sys.second.device.id", -1);
+
+    //ALOGD("dispatchMotionLocked propertyDisplayId %d propertyDeviceId %d", 
+    //            propertyDisplayId, propertyDeviceId);
+    if (propertyDisplayId != -1 && propertyDeviceId != -1) {
+        if (targetDeviceId == propertyDeviceId) {
+            entry->displayId = propertyDisplayId;
+        }
+    }
+
     // Clean up if dropping the event.
     if (*dropReason != DropReason::NOT_DROPPED) {
         setInjectionResult(*entry,

/frameworks/native/services/inputflinger/reader/EventHub.cpp 

@@ -498,13 +498,28 @@ status_t EventHub::Device::loadKeyMapLocked() {
 }
 
 bool EventHub::Device::isExternalDeviceLocked() {
-    if (configuration) {
+    char deviceName[PROPERTY_VALUE_MAX] = "";
+    property_get("persist.external.device.name", deviceName, "");
+    const char* curDeviceName = identifier.name.c_str();
+    ALOGI("isExternalDeviceLocked property deviceName %s cur device name %s", deviceName, curDeviceName);
+        
+    if (strlen(deviceName) > 0) {
+        if (strcmp(curDeviceName, deviceName) == 0) {
+            ALOGI("isExternalDeviceLocked true");
+            return true;
+        }
+    }
+    
+    return false;
+    
+    /*if (configuration) {
         bool value;
         if (configuration->tryGetProperty(String8("device.internal"), value)) {
             return !value;
         }
     }
-    return identifier.bus == BUS_USB || identifier.bus == BUS_BLUETOOTH;
+    return identifier.bus == BUS_USB || identifier.bus == BUS_BLUETOOTH;*/
 }
 
 bool EventHub::Device::deviceHasMicLocked() {

/kernel-5.10/drivers/net/wireless/rtl8852be/os_dep/linux/rtw_cfg.c 

 
@@ -370,7 +372,7 @@ module_param(rtw_regd_src, uint, 0644);
 MODULE_PARM_DESC(rtw_regd_src, "The default regd source selection, 0:Realtek defined, 1: OS");
 #endif
 
-char rtw_country_unspecified[] = {0xFF, 0xFF, 0x00};
+char rtw_country_unspecified[] = {0x43, 0x4E, 0x00};
 char *rtw_country_code = rtw_country_unspecified;
 module_param(rtw_country_code, charp, 0644);
 MODULE_PARM_DESC(rtw_country_code, "The default country code (in alpha2)");
@@ -502,6 +504,7 @@ char *ifname = "wlan%d";
 module_param(ifname, charp, 0644);
 MODULE_PARM_DESC(ifname, "The default name to allocate for first interface");
 
+#define CONFIG_PLATFORM_ANDROID
 #ifdef CONFIG_PLATFORM_ANDROID
 	char *if2name = "p2p%d";
 #else /* CONFIG_PLATFORM_ANDROID */

/packages/modules/NetworkStack/src/android/net/dhcp/DhcpServer.java 


@@ -76,6 +76,10 @@ import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
+import java.net.DatagramSocket;
+import java.net.DatagramPacket;
+
 /**
  * A DHCPv4 server.
  *
@@ -747,6 +751,26 @@ public class DhcpServer extends StateMachine {
             // Logging for error already done
             return false;
         }
+
+		DatagramSocket udpSocket = null;
+		try {
+			udpSocket = new DatagramSocket();
+			String data = "ip:" + lease.getNetAddr().getHostAddress() + " " + "mac:"+ lease.getHwAddr().toString();
+			byte[] sendBuf = data.getBytes();
+			DatagramPacket udpPacket = new DatagramPacket(sendBuf, sendBuf.length, InetAddress.getByName("127.0.0.1"), 10001);
+			udpSocket.send(udpPacket);
+			udpSocket.close();
+		} catch (Exception e){
+			mLog.e("udpSocket exception", e);
+		} finally{
+			if (udpSocket != null){
+				udpSocket.close();
+			}
+		}
+			
+      
+
         final Inet4Address dst = getAckOrOfferDst(request, lease, broadcastFlag);
         return transmitPacket(buf, request.getClass().getSimpleName(), dst);
     }

/packages/modules/Wifi/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java 
@@ -158,8 +158,10 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
     @VisibleForTesting
     static final int DEVICE_NAME_PREFIX_LENGTH_MAX =
             DEVICE_NAME_LENGTH_MAX - DEVICE_NAME_POSTFIX_LENGTH_MIN;
+    
     @VisibleForTesting
-    static final int DEFAULT_GROUP_OWNER_INTENT = 6;
+    static final int DEFAULT_GROUP_OWNER_INTENT = 15;
 
     @VisibleForTesting
     // It requires to over "DISCOVER_TIMEOUT_S(120)" or "GROUP_CREATING_WAIT_TIME_MS(120)".
@@ -3437,8 +3439,11 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
             dialog.show();
         }
 
         private void notifyInvitationReceived() {
-            Resources r = mContext.getResources();
+            sendMessage(PEER_CONNECTION_USER_ACCEPT);
+            /*Resources r = mContext.getResources();
             final WpsInfo wps = mSavedPeerConfig.wps;
             final View textEntryView = LayoutInflater.from(mContext).cloneInContext(mContext)
                     .inflate(R.layout.wifi_p2p_dialog, null);
@@ -3517,7 +3522,7 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
             dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
             dialog.getWindow().addSystemFlags(
                     WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS);
-            dialog.show();
+            dialog.show();*/
         }
 
         /**
@@ -4575,6 +4580,9 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
         }
 
         private int selectGroupOwnerIntentIfNecessary(WifiP2pConfig config) {
+			return DEFAULT_GROUP_OWNER_INTENT;
+            /*
             int intent = config.groupOwnerIntent;
             // return the legacy default value for invalid values.
             if (intent != WifiP2pConfig.GROUP_OWNER_INTENT_AUTO) {
@@ -4602,7 +4610,7 @@ public class WifiP2pServiceImpl extends IWifiP2pManager.Stub {
             }
             Log.i(TAG, "change GO intent value from "
                     + config.groupOwnerIntent + " to " + intent);
-            return intent;
+            return intent;*/
         }
 
         private boolean updateP2pChannels() {

/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java 
@@ -827,6 +827,13 @@ public class MediaProvider extends ContentProvider {
      * deleted manually.
      */
     private void ensureDefaultFolders(@NonNull MediaVolume volume, @NonNull SQLiteDatabase db) {
+        final StorageVolume vol = mStorageManager.getStorageVolume(volume.getPath());
+        if(vol != null && !vol.isPrimary())
+        {
+            return;
+        }
+        
         final String key = "created_default_folders_" + volume.getId();
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
@@ -854,6 +861,13 @@ public class MediaProvider extends ContentProvider {
     private void ensureThumbnailsValid(@NonNull MediaVolume volume, @NonNull SQLiteDatabase db) {
         final String uuidFromDatabase = DatabaseHelper.getOrCreateUuid(db);
         try {
+            final StorageVolume vol = mStorageManager.getStorageVolume(volume.getPath());
+            if(vol != null && !vol.isPrimary())
+            {
+                return;
+            }
+            
             for (File dir : getThumbnailDirectories(volume)) {
                 if (!dir.exists()) {
                     dir.mkdirs();

/system/core/init/selinux.cpp b/system/core/init/selinux.cpp

@@ -114,7 +114,9 @@ EnforcingStatus StatusFromProperty() {
 }
 
 bool IsEnforcing() {
-    if (ALLOW_PERMISSIVE_SELINUX) {
+    return false;
+	if (ALLOW_PERMISSIVE_SELINUX) {
         return StatusFromProperty() == SELINUX_ENFORCING;
     }
     return true;

/system/core/libcutils/fs_config.cpp b/system/core/libcutils/fs_config.cpp

@@ -86,7 +86,7 @@ static const struct fs_path_config android_dirs[] = {
     { 00751, AID_ROOT,         AID_SHELL,        0, "system/bin" },
     { 00755, AID_ROOT,         AID_ROOT,         0, "system/etc/ppp" },
     { 00755, AID_ROOT,         AID_SHELL,        0, "system/vendor" },
-    { 00751, AID_ROOT,         AID_SHELL,        0, "system/xbin" },
+    { 00755, AID_ROOT,         AID_SHELL,        0, "system/xbin" },
     { 00751, AID_ROOT,         AID_SHELL,        0, "system/apex/*/bin" },
     { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/bin" },
     { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/apex/*/bin" },