LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I1b9dc4d5,I44da96fa am: ee0870d0a2 am: c9ba8a847a

Browse Source 
am: fe82e6eba4

Change-Id: Ib0d38141c3313becb1e6329113fd2cac15bc5ed5
This commit is contained in:
Lorenzo Colitti
2018-10-01 21:13:14 -07:00
committed by android-build-merger
parent 7f60204377 fe82e6eba4
commit 50445e3e1c
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/Development/src/com/android/development/Connectivity.java
View File

@@ -85,6 +85,8 @@ import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.INET_CONDITION_ACTION;
import static android.net.NetworkCapabilities.*; import static android.net.NetworkCapabilities.*;
public class Connectivity extends Activity { public class Connectivity extends Activity {
@@ -153,8 +155,23 @@ public class Connectivity extends Activity {
private static final String TEST_ALARM_CYCLE_EXTRA = "CONNECTIVITY_TEST_CYCLE_EXTRA"; private static final String TEST_ALARM_CYCLE_EXTRA = "CONNECTIVITY_TEST_CYCLE_EXTRA";
private static final String SCREEN_ON = "SCREEN_ON"; private static final String SCREEN_ON = "SCREEN_ON";
private static final String SCREEN_OFF = "SCREEN_OFF"; private static final String SCREEN_OFF = "SCREEN_OFF";
private static final String NETWORK_CONDITIONS_MEASURED =
"android.net.conn.NETWORK_CONDITIONS_MEASURED";
private void logBroadcast(Intent intent) {
StringBuilder sb = new StringBuilder();
Bundle b = intent.getExtras();
for (String key : b.keySet()) {
sb.append(String.format(" %s=%s", key, b.get(key)));
}
Log.d(TAG, "Got broadcast " + intent.getAction() + " extras:" + sb.toString());
}
public BroadcastReceiver mReceiver = new BroadcastReceiver() { public BroadcastReceiver mReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
logBroadcast(intent);
if (intent.getAction().equals(CONNECTIVITY_TEST_ALARM)) { if (intent.getAction().equals(CONNECTIVITY_TEST_ALARM)) {
String extra = (String)intent.getExtra(TEST_ALARM_EXTRA); String extra = (String)intent.getExtra(TEST_ALARM_EXTRA);
PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE); PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
@@ -465,7 +482,13 @@ public class Connectivity extends Activity {
} }
onHttpRequestResults(null); onHttpRequestResults(null);
registerReceiver(mReceiver, new IntentFilter(CONNECTIVITY_TEST_ALARM)); IntentFilter broadcastFilter = new IntentFilter();
broadcastFilter.addAction(CONNECTIVITY_ACTION);
broadcastFilter.addAction(CONNECTIVITY_TEST_ALARM);
broadcastFilter.addAction(INET_CONDITION_ACTION);
broadcastFilter.addAction(NETWORK_CONDITIONS_MEASURED);
registerReceiver(mReceiver, broadcastFilter);
mLinkStatsResults = (TextView)findViewById(R.id.stats); mLinkStatsResults = (TextView)findViewById(R.id.stats);
mLinkStatsResults.setVisibility(View.VISIBLE); mLinkStatsResults.setVisibility(View.VISIBLE);

1
apps/Development/src/com/android/development/OWNERS Normal file
View File

@@ -0,0 +1 @@
per-file Connectivity.java = codewiz@google.com, jchalard@google.com, lorenzo@google.com, reminv@google.com, satk@google.com