Merge a851d8d0 from gingerbread (36e7790b) · Commits · e / os / android_frameworks_base

cmds/servicemanager/service_manager.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ static struct {
		{ AID_MEDIA, "media.audio_policy" },
		{ AID_DRMIO, "drm.drmIOService" },
		{ AID_DRM, "drm.drmManager" },
		{ AID_NFC, "nfc" },
		{ AID_RADIO, "radio.phone" },
		{ AID_RADIO, "radio.sms" },
		{ AID_RADIO, "radio.phonesubinfo" },

core/java/android/content/Context.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -1554,16 +1554,6 @@ public abstract class Context {
		/** @hide */
		public static final String SIP_SERVICE = "sip";

		/**
		* Use with {@link #getSystemService} to retrieve an
		* {@link com.trustedlogic.trustednfc.android.INfcManager.INfcManager} for
		* accessing NFC methods.
		*
		* @see #getSystemService
		* @hide
		*/
		public static final String NFC_SERVICE = "nfc";

		/**
		* Determine whether the given permission is allowed for a particular
		* process and user ID running in the system.

core/java/android/nfc/NfcAdapter.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -166,10 +166,10 @@ public final class NfcAdapter {
		}
		sIsInitialized = true;

		// TODO(npelly): check which method to use here to get the service
		IBinder b = ServiceManager.getService(Context.NFC_SERVICE);
		IBinder b = ServiceManager.getService("nfc");
		if (b == null) {
		return null; // This device does not have NFC
		Log.d(TAG, "NFC Service not available");
		return null;
		}

		sAdapter = new NfcAdapter(INfcAdapter.Stub.asInterface(b));

core/java/android/os/Process.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,12 @@ public class Process {
		*/
		public static final int WIFI_UID = 1010;

		/**
		* Defines the UID/GID for the NFC service process.
		* @hide
		*/
		public static final int NFC_UID = 1022;

		/**
		* Defines the start of a range of UIDs (and GIDs), going from this
		* number to {@link #LAST_APPLICATION_UID} that are reserved for assigning

core/java/com/trustedlogic/trustednfc/android/internal/NativeLlcpServiceSocket.java

deleted100644 → 0

+0 −82

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.
		*/

		/**
		* File : NativeLlcpServerSocket.java
		* Original-Author : Trusted Logic S.A. (Sylvain Fonteneau)
		* Created : 18-02-2010
		*/

		package com.trustedlogic.trustednfc.android.internal;

		/**
		* LlcpServiceSocket represents a LLCP Service to be used in a
		* Connection-oriented communication
		* {@hide}
		*/

		public class NativeLlcpServiceSocket {

		private int mHandle;

		private int mLocalMiu;

		private int mLocalRw;

		private int mLocalLinearBufferLength;

		private int mSap;

		private int mTimeout;

		private String mServiceName;

		public NativeLlcpServiceSocket(){

		}

		public NativeLlcpServiceSocket(String serviceName){
		mServiceName = serviceName;
		}

		public native NativeLlcpSocket doAccept(int timeout, int miu, int rw, int linearBufferLength);

		public native boolean doClose();

		public int getHandle(){
		return mHandle;
		}

		public void setAcceptTimeout(int timeout){
		mTimeout = timeout;
		}

		public int getAcceptTimeout(){
		return mTimeout;
		}

		public int getRw(){
		return mLocalRw;
		}

		public int getMiu(){
		return mLocalMiu;
		}

		public int getLinearBufferLength(){
		return mLocalLinearBufferLength;
		}
		}