Add a no-op activity to handle development setting intent.
This no-op activity is only enabled when the real setting is
turned off.
Change-Id: I7ccf4645054a60569a77076c24cf42da80479fed
Fix: 37651414
Test: rerun CTS test android.systemintents.cts.TestSystemIntents#testSystemIntents
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9e23380..b9c0f9f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1880,6 +1880,20 @@
android:value="true" />
</activity>
+ <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real
+ activity is disabled to be CTS compliant. -->
+ <activity
+ android:name=".development.DevelopmentSettingsDisabledActivity"
+ android:icon="@drawable/ic_settings_development"
+ android:label="@string/development_settings_title"
+ android:theme="@android:style/Theme.NoDisplay">
+ <intent-filter android:priority="-1">
+ <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
+ <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name="Settings$PrintSettingsActivity"
android:label="@string/print_settings"
android:icon="@drawable/ic_settings_print"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java b/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
new file mode 100644
index 0000000..31f7a20
--- /dev/null
+++ b/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class DevelopmentSettingsDisabledActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ finish();
+ }
+}