diff options
| author | Jason Monk <jmonk@google.com> | 2014-12-16 17:11:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 17:11:29 +0000 |
| commit | 2e904fdd28263b9dc0015c46c99a1fd8030a7aed (patch) | |
| tree | fb9dabe2022fad05a70d0cbdfb2128dcadc7f746 /AndroidManifest.xml | |
| parent | 506c13fd306bf9b1275a2ae2a6c1197fd9caebde (diff) | |
| parent | c0ecaeefe8d22c8dbd77c51090cb55e1c448b983 (diff) | |
| download | packages_apps_Settings-2e904fdd28263b9dc0015c46c99a1fd8030a7aed.tar.gz packages_apps_Settings-2e904fdd28263b9dc0015c46c99a1fd8030a7aed.tar.bz2 packages_apps_Settings-2e904fdd28263b9dc0015c46c99a1fd8030a7aed.zip | |
am c0ecaeef: am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
* commit 'c0ecaeefe8d22c8dbd77c51090cb55e1c448b983':
Add a periodic check of the tethering provisioning
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 38c6bcef2..f12825602 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -352,9 +352,15 @@ </intent-filter> </activity> - <activity android:name=".EnableWifiTether" - android:theme="@style/Transparent" - android:excludeFromRecents="true" /> + <service android:name=".TetherService" + android:exported="true" + android:permission="android.permission.CONNECTIVITY_INTERNAL" /> + <receiver + android:name=".HotspotOffReceiver" > + <intent-filter> + <action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" /> + </intent-filter> + </receiver> <activity android:name="Settings$TetherSettingsActivity" android:label="@string/tether_settings_title_all" |