Merge changes I90566684,I93018920 into tm-qpr-dev
* changes:
Allow targets deriving from CF to turn off rename_eth0
Allow targets deriving from CF choosing the interface to setup wifi on.
diff --git a/default-permissions.xml b/default-permissions.xml
index 48b0f17..2d5020a 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -133,4 +133,9 @@
<!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
</exception>
+ <exception
+ package="com.google.android.euicc">
+ <!-- Notifications -->
+ <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+ </exception>
</exceptions>
diff --git a/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml b/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml
index 85b6cad..8186c97 100644
--- a/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml
@@ -24,6 +24,7 @@
<item>0:1</item> <!-- CLOSED : STATE_FLAT -->
<item>1:2</item> <!-- HALF_OPENED : STATE_HALF_OPENED -->
<item>2:3</item> <!-- OPENED : STATE_FLIPPED -->
+ <item>3:1</item> <!-- REAR_DISPLAY: STATE_FLAT -->
</string-array>
<!-- The device states (supplied by DeviceStateManager) that should be treated as folded by the
display fold controller. -->
