PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove extra newline in AndroidManifest.

Browse Source 
Remove extra newline in AndroidManifest which caused
android.settings.MOBILE_DATA_USAGE not received.

Bug: b/63670955
Test: testcase MobileDataUsageActivityTest
Change-Id: I4a4178141010b128e3d9c8c9721a51b81cbdffff
This commit is contained in:
Malcolm Chen
2017-07-13 17:59:58 -07:00
parent 7eee73a0c8
commit 6fef2fff5e
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -2435,8 +2435,7 @@
android:taskAffinity=""> android:taskAffinity="">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.MOBILE_DATA_USAGE" /> <action android:name="android.settings.MOBILE_DATA_USAGE" />
<category android:name=" <category android:name="android.intent.category.DEFAULT" />
android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.datausage.DataUsageList" /> android:value="com.android.settings.datausage.DataUsageList" />

63
tests/unit/src/com/android/settings/datausage/MobileDataUsageActivityTest.java Normal file
View File

@@ -0,0 +1,63 @@
/*
* 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;
import static junit.framework.Assert.assertEquals;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.NetworkTemplate;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
@SmallTest
public class MobileDataUsageActivityTest {
private static final String TAG = "MobileDataUsageTest";
@Test
public void test_mobileDataUsageIntent() {
final Context context = InstrumentationRegistry.getTargetContext();
final PackageManager packageManager = context.getPackageManager();
final int subId = SubscriptionManager.getDefaultSubscriptionId();
final NetworkTemplate template = getNetworkTemplate(context, subId);
Intent intent = new Intent(android.provider.Settings.ACTION_MOBILE_DATA_USAGE);
intent.putExtra(android.provider.Settings.EXTRA_NETWORK_TEMPLATE, template);
intent.putExtra(android.provider.Settings.EXTRA_SUB_ID, subId);
assertEquals(packageManager.queryIntentActivities(intent, 0).size(), 1);
context.startActivity(intent);
// Should exit gracefully without crashing.
}
private NetworkTemplate getNetworkTemplate(Context context, int subId) {
TelephonyManager tm = (TelephonyManager) context
.getSystemService(Context.TELEPHONY_SERVICE);
NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
tm.getSubscriberId(subId));
return NetworkTemplate.normalize(mobileAll,
tm.getMergedSubscriberIds());
}
}