Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "support suw and post-suw cases for default app"

Browse Source
This commit is contained in:
Chen Xu
2017-01-24 02:30:58 +00:00
committed by Gerrit Code Review
parent edadb3efc3 72ee500527
commit 9fc8d99c76
3 changed files with 120 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CarrierDefaultApp/AndroidManifest.xml
View File

@@ -37,5 +37,7 @@
<activity android:name="com.android.carrierdefaultapp.CaptivePortalLaunchActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:excludeFromRecents="true"/>
<service android:name="com.android.carrierdefaultapp.ProvisionObserver"
android:permission="android.permission.BIND_JOB_SERVICE"/>
</application>
</manifest>

4
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierDefaultBroadcastReceiver.java
View File

@@ -28,6 +28,10 @@ public class CarrierDefaultBroadcastReceiver extends BroadcastReceiver{
@Override
public void onReceive(Context context, Intent intent) {
Log.d(TAG, "onReceive intent: " + intent.getAction());
if (ProvisionObserver.isDeferredForProvision(context, intent)) {
Log.d(TAG, "skip carrier actions during provisioning");
return;
}
List<Integer> actionList = CustomConfigLoader.loadCarrierActionList(context, intent);
for (int actionIdx : actionList) {
Log.d(TAG, "apply carrier action idx: " + actionIdx);

114
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/ProvisionObserver.java Normal file
View File

@@ -0,0 +1,114 @@
/*
* 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.carrierdefaultapp;
import android.app.job.JobInfo;
import android.app.job.JobParameters;
import android.app.job.JobScheduler;
import android.app.job.JobService;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.provider.Settings;
import android.util.Log;
import com.android.internal.telephony.TelephonyIntents;
/**
* Service to run {@link android.app.job.JobScheduler} job.
* Service to monitor when there is a change to conent URI
* {@link android.provider.Settings.Global#DEVICE_PROVISIONED DEVICE_PROVISIONED}
*/
public class ProvisionObserver extends JobService {
private static final String TAG = ProvisionObserver.class.getSimpleName();
public static final int PROVISION_OBSERVER_REEVALUATION_JOB_ID = 1;
// minimum & maximum update delay TBD
private static final int CONTENT_UPDATE_DELAY_MS = 100;
private static final int CONTENT_MAX_DELAY_MS = 200;
@Override
public boolean onStartJob(JobParameters jobParameters) {
switch (jobParameters.getJobId()) {
case PROVISION_OBSERVER_REEVALUATION_JOB_ID:
if (isProvisioned(this)) {
Log.d(TAG, "device provisioned, force network re-evaluation");
final ConnectivityManager connMgr = ConnectivityManager.from(this);
Network[] info = connMgr.getAllNetworks();
for (Network nw : info) {
final NetworkCapabilities nc = connMgr.getNetworkCapabilities(nw);
if (nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
&& nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
// force connectivity re-evaluation to assume skipped carrier actions.
// one of the following calls will match the last evaluation.
connMgr.reportNetworkConnectivity(nw, true);
connMgr.reportNetworkConnectivity(nw, false);
break;
}
}
}
default:
break;
}
return false;
}
@Override
public boolean onStopJob(JobParameters jobParameters) {
return false;
}
// Returns true if the device is not provisioned yet (in setup wizard), false otherwise
private static boolean isProvisioned(Context context) {
return Settings.Global.getInt(context.getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 0) == 1;
}
/**
* Static utility function to schedule a job to execute upon the change of content URI
* {@link android.provider.Settings.Global#DEVICE_PROVISIONED DEVICE_PROVISIONED}.
* @param context The context used to retrieve the {@link ComponentName} and system services
* @return true carrier actions are deferred due to phone provisioning process, false otherwise
*/
public static boolean isDeferredForProvision(Context context, Intent intent) {
if (isProvisioned(context)) {
return false;
}
int jobId;
switch(intent.getAction()) {
case TelephonyIntents.ACTION_CARRIER_SIGNAL_REDIRECTED:
jobId = PROVISION_OBSERVER_REEVALUATION_JOB_ID;
break;
default:
return false;
}
final JobScheduler jobScheduler = (JobScheduler) context.getSystemService(
Context.JOB_SCHEDULER_SERVICE);
final JobInfo job = new JobInfo.Builder(jobId,
new ComponentName(context, ProvisionObserver.class))
.addTriggerContentUri(new JobInfo.TriggerContentUri(
Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED), 0))
.setTriggerContentUpdateDelay(CONTENT_UPDATE_DELAY_MS)
.setTriggerContentMaxDelay(CONTENT_MAX_DELAY_MS)
.build();
jobScheduler.schedule(job);
return true;
}
}