diff options
| author | 2020-03-18 15:46:39 -0700 | |
|---|---|---|
| committer | 2020-03-23 18:34:09 +0000 | |
| commit | e178c24db3abb8d1ebaba5052b05c99204dc6c88 (patch) | |
| tree | b924d8b82d314091dd19dce280b4df3179cdf197 /samples | |
| parent | ed91e9135b957debeeb18b3267c2761912101ff5 (diff) | |
Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.
These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.
Bug: 150232615
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: I4457ff2bd466a4c56fed2570e110f251031c2385
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/training/network-usage/AndroidManifest.xml | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/samples/training/network-usage/AndroidManifest.xml b/samples/training/network-usage/AndroidManifest.xml index 4b96d148b5d2..3cd46511e98a 100644 --- a/samples/training/network-usage/AndroidManifest.xml +++ b/samples/training/network-usage/AndroidManifest.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2012 The Android Open Source Project @@ -15,33 +16,34 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.example.android.networkusage" - android:versionCode="1" - android:versionName="1.0" > + package="com.example.android.networkusage" + android:versionCode="1" + android:versionName="1.0"> <uses-sdk android:minSdkVersion="4" - android:targetSdkVersion="14" /> + android:targetSdkVersion="14"/> - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.INTERNET"/> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> - <application - android:icon="@drawable/ic_launcher" - android:label="@string/app_name" > + <application android:icon="@drawable/ic_launcher" + android:label="@string/app_name"> - <activity - android:name="com.example.networkusage.NetworkActivity" - android:label="@string/app_name" > + <activity android:name="com.example.networkusage.NetworkActivity" + android:label="@string/app_name" + android:exported="true"> <intent-filter> - <action android:name="android.intent.action.MAIN" /> + <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER" /> + <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> - <activity android:label="SettingsActivity" android:name=".SettingsActivity"> + <activity android:label="SettingsActivity" + android:name=".SettingsActivity" + android:exported="true"> <intent-filter> - <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" /> - <category android:name="android.intent.category.DEFAULT" /> + <action android:name="android.intent.action.MANAGE_NETWORK_USAGE"/> + <category android:name="android.intent.category.DEFAULT"/> </intent-filter> </activity> </application> |