summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2016-06-10 11:10:30 -0700
committerRoman Birg <roman@cyngn.com>2016-06-10 11:12:39 -0700
commit606f7ef82315918e02dec32fc8dc3dd22e1e38b2 (patch)
treea8f5c28f66183396246af59c2fcf946e02c97ff5
parent6e8f8250108213bc18860e77056387959950e2ad (diff)
downloadandroid_packages_apps_Nfc-606f7ef82315918e02dec32fc8dc3dd22e1e38b2.tar.gz
android_packages_apps_Nfc-606f7ef82315918e02dec32fc8dc3dd22e1e38b2.tar.bz2
android_packages_apps_Nfc-606f7ef82315918e02dec32fc8dc3dd22e1e38b2.zip
Revert "nfc: create a bootstrap service"
We no longer need to start NFC before anything else, System UI will properly handle getting a proper refernce to the Nfc Adapter. This reverts commit 7bc697ba42a368c01c46c4d546e069c1f2601fd6. Change-Id: I6f3eeceba4c31b955b7a95c3b1337e1cd576c21e
-rwxr-xr-xAndroidManifest.xml2
-rw-r--r--src/com/android/nfc/NfcBootstrapService.java39
2 files changed, 0 insertions, 41 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 942a9f07..7dd33798 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -135,7 +135,5 @@
<service android:name=".handover.PeripheralHandoverService"
/>
-
- <service android:name=".NfcBootstrapService" exported="true" />
</application>
</manifest>
diff --git a/src/com/android/nfc/NfcBootstrapService.java b/src/com/android/nfc/NfcBootstrapService.java
deleted file mode 100644
index 1b2b7b1b..00000000
--- a/src/com/android/nfc/NfcBootstrapService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod 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.nfc;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-/**
- * This is just a no-op service to allow Nfc app being started at boot time.
- */
-public class NfcBootstrapService extends Service {
-
- @Override
- public IBinder onBind(Intent intent) {
- return null;
- }
-
- @Override
- public int onStartCommand(Intent intent, int flags, int startId) {
- stopSelf(startId);
- return Service.START_NOT_STICKY;
- }
-
-}