e22bd7a2e8
Tethering resource configuration is move from framwork to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
--> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
--> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
--> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID
Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently. Will replace hard code
string as tethering module-lib APIs in b/159085857.
Also move the entitlement response intent registeration from onCreated
to onStartCommand, this can avoid wrong intent registeration if subId
changed between onCreate and when the intent arrived.
Bug: 146918263
Test: atest TetherServiceTest
atest TetherProvisioningActivityTest
Change-Id: I3d06df01302a9c1f0893712d9250fe394dc66588
111 lines
4.7 KiB
Java
111 lines
4.7 KiB
Java
/*
|
|
* Copyright (C) 2016 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.network;
|
|
|
|
import static android.net.TetheringConstants.EXTRA_ADD_TETHER_TYPE;
|
|
import static android.net.TetheringConstants.EXTRA_PROVISION_CALLBACK;
|
|
import static android.net.TetheringManager.TETHERING_INVALID;
|
|
import static android.net.TetheringManager.TETHER_ERROR_NO_ERROR;
|
|
import static android.net.TetheringManager.TETHER_ERROR_PROVISIONING_FAILED;
|
|
import static android.telephony.SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX;
|
|
import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
|
|
|
|
import android.app.Activity;
|
|
import android.content.Intent;
|
|
import android.content.pm.PackageManager;
|
|
import android.os.Bundle;
|
|
import android.os.ResultReceiver;
|
|
import android.os.UserHandle;
|
|
import android.telephony.SubscriptionManager;
|
|
import android.util.Log;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
/**
|
|
* Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
|
|
* restrictions. Specifically, the provisioning apps require
|
|
* {@link android.permission.TETHER_PRIVILEGED}, while this activity can be started by a caller
|
|
* with {@link android.permission.TETHER_PRIVILEGED}.
|
|
*/
|
|
public class TetherProvisioningActivity extends Activity {
|
|
private static final String TAG = "TetherProvisioningAct";
|
|
private static final String EXTRA_TETHER_TYPE = "TETHER_TYPE";
|
|
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
|
|
private ResultReceiver mResultReceiver;
|
|
@VisibleForTesting
|
|
static final int PROVISION_REQUEST = 0;
|
|
@VisibleForTesting
|
|
static final String EXTRA_TETHER_SUBID = "android.net.extra.TETHER_SUBID";
|
|
@VisibleForTesting
|
|
public static final String EXTRA_TETHER_UI_PROVISIONING_APP_NAME =
|
|
"android.net.extra.TETHER_UI_PROVISIONING_APP_NAME";
|
|
|
|
@Override
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
mResultReceiver = (ResultReceiver) getIntent().getParcelableExtra(EXTRA_PROVISION_CALLBACK);
|
|
|
|
final int tetherType = getIntent().getIntExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_INVALID);
|
|
|
|
final int tetherSubId = getIntent().getIntExtra(
|
|
EXTRA_TETHER_SUBID, INVALID_SUBSCRIPTION_ID);
|
|
final int subId = SubscriptionManager.getActiveDataSubscriptionId();
|
|
if (tetherSubId != subId) {
|
|
Log.e(TAG, "This Provisioning request is outdated, current subId: " + subId);
|
|
mResultReceiver.send(TETHER_ERROR_PROVISIONING_FAILED, null);
|
|
finish();
|
|
return;
|
|
}
|
|
String[] provisionApp = getIntent().getStringArrayExtra(
|
|
EXTRA_TETHER_UI_PROVISIONING_APP_NAME);
|
|
if (provisionApp == null || provisionApp.length != 2) {
|
|
Log.e(TAG, "Unexpected provision app configuration");
|
|
return;
|
|
}
|
|
final Intent intent = new Intent(Intent.ACTION_MAIN);
|
|
intent.setClassName(provisionApp[0], provisionApp[1]);
|
|
intent.putExtra(EXTRA_TETHER_TYPE, tetherType);
|
|
intent.putExtra(EXTRA_SUBSCRIPTION_INDEX, subId);
|
|
intent.putExtra(EXTRA_PROVISION_CALLBACK, mResultReceiver);
|
|
if (DEBUG) {
|
|
Log.d(TAG, "Starting provisioning app: " + provisionApp[0] + "." + provisionApp[1]);
|
|
}
|
|
|
|
if (getPackageManager().queryIntentActivities(intent,
|
|
PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {
|
|
Log.e(TAG, "Provisioning app is configured, but not available.");
|
|
mResultReceiver.send(TETHER_ERROR_PROVISIONING_FAILED, null);
|
|
finish();
|
|
return;
|
|
}
|
|
|
|
startActivityForResultAsUser(intent, PROVISION_REQUEST, UserHandle.CURRENT);
|
|
}
|
|
|
|
@Override
|
|
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
|
|
super.onActivityResult(requestCode, resultCode, intent);
|
|
if (requestCode == PROVISION_REQUEST) {
|
|
if (DEBUG) Log.d(TAG, "Got result from app: " + resultCode);
|
|
int result = resultCode == Activity.RESULT_OK
|
|
? TETHER_ERROR_NO_ERROR : TETHER_ERROR_PROVISIONING_FAILED;
|
|
mResultReceiver.send(result, null);
|
|
finish();
|
|
}
|
|
}
|
|
}
|