diff options
| -rw-r--r-- | cmds/installd/InstalldNativeService.cpp | 3 | ||||
| -rw-r--r-- | opengl/tests/gl2_cameraeye/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | opengl/tests/gl2_java/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | opengl/tests/gl2_jni/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | opengl/tests/gl_jni/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | opengl/tests/lighting1709/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | opengl/tests/testPauseResume/AndroidManifest.xml | 3 |
7 files changed, 6 insertions, 13 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 1238018006..a49f563060 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -2876,9 +2876,6 @@ binder::Status InstalldNativeService::getExternalSize(const std::optional<std::s auto obbPath = StringPrintf("%s/Android/obb", create_data_media_path(uuid_, userId).c_str()); calculate_tree_size(obbPath, &obbSize); - if (!(flags & FLAG_USE_QUOTA)) { - totalSize -= obbSize; - } ATRACE_END(); } diff --git a/opengl/tests/gl2_cameraeye/AndroidManifest.xml b/opengl/tests/gl2_cameraeye/AndroidManifest.xml index a4674e129d..c53f7be0b0 100644 --- a/opengl/tests/gl2_cameraeye/AndroidManifest.xml +++ b/opengl/tests/gl2_cameraeye/AndroidManifest.xml @@ -26,7 +26,7 @@ <uses-feature android:name="android.hardware.camera.autofocus" /> <uses-feature android:glEsVersion="0x00020000" /> <application android:label="@string/gl2cameraeye_name"> - <activity android:name="GL2CameraEye" android:exported="true"> + <activity android:name="GL2CameraEye"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> diff --git a/opengl/tests/gl2_java/AndroidManifest.xml b/opengl/tests/gl2_java/AndroidManifest.xml index 500adb5c14..8bb6840a16 100644 --- a/opengl/tests/gl2_java/AndroidManifest.xml +++ b/opengl/tests/gl2_java/AndroidManifest.xml @@ -22,8 +22,7 @@ <activity android:name="GL2JavaActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" - android:configChanges="orientation|keyboardHidden" - android:exported="true"> + android:configChanges="orientation|keyboardHidden"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/opengl/tests/gl2_jni/AndroidManifest.xml b/opengl/tests/gl2_jni/AndroidManifest.xml index b4ce99b102..1827e5f377 100644 --- a/opengl/tests/gl2_jni/AndroidManifest.xml +++ b/opengl/tests/gl2_jni/AndroidManifest.xml @@ -21,8 +21,7 @@ <activity android:name="GL2JNIActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" - android:configChanges="orientation|keyboardHidden" - android:exported="true"> + android:configChanges="orientation|keyboardHidden"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/opengl/tests/gl_jni/AndroidManifest.xml b/opengl/tests/gl_jni/AndroidManifest.xml index bedab56659..5d0ec966f4 100644 --- a/opengl/tests/gl_jni/AndroidManifest.xml +++ b/opengl/tests/gl_jni/AndroidManifest.xml @@ -24,8 +24,7 @@ android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden" - android:exported="true"> + android:configChanges="orientation|keyboardHidden"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/opengl/tests/lighting1709/AndroidManifest.xml b/opengl/tests/lighting1709/AndroidManifest.xml index d766be9ed5..6c23d422f5 100644 --- a/opengl/tests/lighting1709/AndroidManifest.xml +++ b/opengl/tests/lighting1709/AndroidManifest.xml @@ -2,7 +2,7 @@ package="com.android.lightingtest"> <application> - <activity android:name="ClearActivity" android:label="LightingTest" android:exported="true"> + <activity android:name="ClearActivity" android:label="LightingTest"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> diff --git a/opengl/tests/testPauseResume/AndroidManifest.xml b/opengl/tests/testPauseResume/AndroidManifest.xml index ae82a8286a..1879bc3217 100644 --- a/opengl/tests/testPauseResume/AndroidManifest.xml +++ b/opengl/tests/testPauseResume/AndroidManifest.xml @@ -24,8 +24,7 @@ android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" android:screenOrientation="landscape" - android:configChanges="orientation|keyboardHidden" - android:exported="true"> + android:configChanges="orientation|keyboardHidden"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> |