Update emergency number authority name to be more generic

Bug: 180236600
Test: rebuild
Change-Id: Ic05d4c3281f0fb8e915076e26a032f237f795a95

2 files changed, 4 insertions, 101 deletions

diff --git a/src/com/android/emergency/action/EmergencyActionActivity.java b/src/com/android/emergency/action/EmergencyActionActivity.java
index 8d4ee49a..63c1fd1b 100644
--- a/src/com/android/emergency/action/EmergencyActionActivity.java
+++ b/src/com/android/emergency/action/EmergencyActionActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.emergency.action;
 
+import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_SETTING_ON;
+
 import android.annotation.Nullable;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -32,14 +34,14 @@ import com.android.emergency.R;
 public class EmergencyActionActivity extends FragmentActivity {
 
     private static final String TAG = "EmergencyAction";
-    private static final int SETTING_ON = 1;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.emergency_action_activity);
         if (Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.EMERGENCY_GESTURE_ENABLED, SETTING_ON) != SETTING_ON) {
+                Settings.Secure.EMERGENCY_GESTURE_ENABLED, EMERGENCY_SETTING_ON)
+                != EMERGENCY_SETTING_ON) {
             Log.w(TAG, "Emergency gesture is not enabled, exiting");
             finish();
             return;
diff --git a/src/com/android/emergency/emergencynumber/EmergencyNumberContentProvider.java b/src/com/android/emergency/emergencynumber/EmergencyNumberContentProvider.java
deleted file mode 100644
index db7e9608..00000000
--- a/src/com/android/emergency/emergencynumber/EmergencyNumberContentProvider.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2021 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.emergency.emergencynumber;
-
-
-import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_GESTURE_CALL_NUMBER;
-import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_NUMBER_OVERRIDE_AUTHORITY;
-import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.METHOD_NAME_GET_EMERGENCY_NUMBER_OVERRIDE;
-import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.METHOD_NAME_SET_EMERGENCY_NUMBER_OVERRIDE;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-
-/**
- * Content provider that gets/sets emergency number override for emergency gesture.
- */
-public class EmergencyNumberContentProvider extends ContentProvider {
-    private static final String TAG = "EmergencyNumberContentP";
-    private static final boolean DEBUG = true;
-    private static final String SHARED_PREFERENCES_NAME =
-            "local_emergency_number_override_shared_pref";
-
-    @Override
-    public Bundle call(String authority, String method, String arg, Bundle extras) {
-        final Bundle bundle = new Bundle();
-        final SharedPreferences preferences = getContext().getSharedPreferences(
-                SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
-        switch (method) {
-            case METHOD_NAME_GET_EMERGENCY_NUMBER_OVERRIDE:
-                if (DEBUG) {
-                    Log.d(TAG, METHOD_NAME_GET_EMERGENCY_NUMBER_OVERRIDE);
-                }
-                bundle.putString(EMERGENCY_GESTURE_CALL_NUMBER,
-                        preferences.getString(EMERGENCY_GESTURE_CALL_NUMBER, null));
-                break;
-            case METHOD_NAME_SET_EMERGENCY_NUMBER_OVERRIDE:
-                if (DEBUG) {
-                    Log.d(TAG, METHOD_NAME_SET_EMERGENCY_NUMBER_OVERRIDE);
-                }
-                final String inputNumber = extras.getString(EMERGENCY_GESTURE_CALL_NUMBER);
-                preferences.edit().putString(EMERGENCY_GESTURE_CALL_NUMBER, inputNumber).apply();
-                getContext().getContentResolver().notifyChange(EMERGENCY_NUMBER_OVERRIDE_AUTHORITY,
-                        null);
-                break;
-        }
-        return bundle;
-    }
-
-    @Override
-    public boolean onCreate() {
-        return true;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        throw new UnsupportedOperationException();
-    }
-}