Merge branch 'gingerbread' into gingerbread-release (d8348aba) · Commits · e / os / android_frameworks_base

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -416,6 +416,8 @@ web_docs_sample_code_flags := \
		resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
		-samplecode $(sample_dir)/SearchableDictionary \
		resources/samples/SearchableDictionary "Searchable Dictionary v2" \
		-samplecode $(sample_dir)/SipDemo \
		resources/samples/SipDemo "SIP Demo" \
		-samplecode $(sample_dir)/Snake \
		resources/samples/Snake "Snake" \
		-samplecode $(sample_dir)/SoftKeyboard \

+18 −18

Original line number	Diff line number	Diff line
		@@ -1872,25 +1872,25 @@ public class SensorManager
		}

		if(prevR.length == 9) {
		pri0 = R[0];
		pri1 = R[1];
		pri2 = R[2];
		pri3 = R[3];
		pri4 = R[4];
		pri5 = R[5];
		pri6 = R[6];
		pri7 = R[7];
		pri8 = R[8];
		pri0 = prevR[0];
		pri1 = prevR[1];
		pri2 = prevR[2];
		pri3 = prevR[3];
		pri4 = prevR[4];
		pri5 = prevR[5];
		pri6 = prevR[6];
		pri7 = prevR[7];
		pri8 = prevR[8];
		} else if(prevR.length == 16) {
		pri0 = R[0];
		pri1 = R[1];
		pri2 = R[2];
		pri3 = R[4];
		pri4 = R[5];
		pri5 = R[6];
		pri6 = R[8];
		pri7 = R[9];
		pri8 = R[10];
		pri0 = prevR[0];
		pri1 = prevR[1];
		pri2 = prevR[2];
		pri3 = prevR[4];
		pri4 = prevR[5];
		pri5 = prevR[6];
		pri6 = prevR[8];
		pri7 = prevR[9];
		pri8 = prevR[10];
		}

		// calculate the parts of the rotation difference matrix we need

+0 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,6 @@ interface INfcAdapter

		// NfcAdapter-class related methods
		boolean isEnabled();
		NdefMessage localGet();
		void localSet(in NdefMessage message);
		void openTagConnection(in Tag tag);

		// Non-public methods

+0 −42

Original line number	Diff line number	Diff line
		@@ -300,48 +300,6 @@ public final class NfcAdapter {
		}
		}

		/**
		* Set the NDEF Message that this NFC adapter should appear as to Tag
		* readers.
		* <p>
		* Any Tag reader can read the contents of the local tag when it is in
		* proximity, without any further user confirmation.
		* <p>
		* The implementation of this method must either
		* <ul>
		* <li>act as a passive tag containing this NDEF message
		* <li>provide the NDEF message on over LLCP to peer NFC adapters
		* </ul>
		* The NDEF message is preserved across reboot.
		* <p>Requires {@link android.Manifest.permission#NFC} permission.
		*
		* @param message NDEF message to make public
		* @hide
		*/
		public void setLocalNdefMessage(NdefMessage message) {
		try {
		mService.localSet(message);
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		}
		}

		/**
		* Get the NDEF Message that this adapter appears as to Tag readers.
		* <p>Requires {@link android.Manifest.permission#NFC} permission.
		*
		* @return NDEF Message that is publicly readable
		* @hide
		*/
		public NdefMessage getLocalNdefMessage() {
		try {
		return mService.localGet();
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		return null;
		}
		}

		/**
		* Create a raw tag connection to the default Target
		* <p>Requires {@link android.Manifest.permission#NFC} permission.

0 → 100644

+892 B

Loading image diff...