Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0. (f5cbc865) · Commits · e / os / android_frameworks_base

Android.mk

+0 −22

Original line number	Diff line number	Diff line
		@@ -425,28 +425,6 @@ framework_res_R_stamp := \
		$(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp
		$(full_classes_compiled_jar): $(framework_res_R_stamp)

		# Build part 2 of the framework library.
		# ============================================================
		include $(CLEAR_VARS)

		LOCAL_MODULE := framework2
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_NO_STANDARD_LIBRARIES := true
		LOCAL_STATIC_JAVA_LIBRARIES := framework-base
		LOCAL_DX_FLAGS := --core-library


		# List of packages to include along with their descendants.
		LOCAL_JAR_PACKAGES := \
		android.hardware \
		com \
		javax \
		org \
		codeaurora

		include $(BUILD_JAVA_LIBRARY)
		framework2_module := $(LOCAL_INSTALLED_MODULE)

		$(framework_module): \| $(dir $(framework_module))framework-res.apk

		framework_built := $(call java-lib-deps,framework)

api/current.txt

+19 −3

Original line number	Diff line number	Diff line
		@@ -10126,6 +10126,14 @@ package android.drm {
		field public static final java.lang.String REMAINING_REPEAT_COUNT = "remaining_repeat_count";
		}

		public static class DrmStore.DrmDeliveryType {
		ctor public DrmStore.DrmDeliveryType();
		field public static final int COMBINED_DELIVERY = 2; // 0x2
		field public static final int FORWARD_LOCK = 1; // 0x1
		field public static final int SEPARATE_DELIVERY = 3; // 0x3
		field public static final int SEPARATE_DELIVERY_FL = 4; // 0x4
		}

		public static class DrmStore.DrmObjectType {
		ctor public deprecated DrmStore.DrmObjectType();
		field public static final int CONTENT = 1; // 0x1
		@@ -10455,15 +10463,23 @@ package android.graphics {
		public class BitmapFactory {
		ctor public BitmapFactory();
		method public static android.graphics.Bitmap decodeByteArray(byte[], int, int, android.graphics.BitmapFactory.Options);
		method public static android.graphics.Bitmap decodeByteArray(byte[], int, int, android.graphics.BitmapFactory.Options, boolean);
		method public static android.graphics.Bitmap decodeByteArray(byte[], int, int);
		method public static android.graphics.Bitmap decodeByteArray(byte[], int, int, boolean);
		method public static android.graphics.Bitmap decodeFile(java.lang.String, android.graphics.BitmapFactory.Options);
		method public static android.graphics.Bitmap decodeFile(java.lang.String, android.graphics.BitmapFactory.Options, boolean);
		method public static android.graphics.Bitmap decodeFile(java.lang.String);
		method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor, android.graphics.Rect, android.graphics.BitmapFactory.Options);
		method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor, android.graphics.Rect, android.graphics.BitmapFactory.Options, boolean);
		method public static android.graphics.Bitmap decodeFileDescriptor(java.io.FileDescriptor);
		method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int, android.graphics.BitmapFactory.Options);
		method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int, android.graphics.BitmapFactory.Options, boolean);
		method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int);
		method public static android.graphics.Bitmap decodeResource(android.content.res.Resources, int, boolean);
		method public static android.graphics.Bitmap decodeResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options);
		method public static android.graphics.Bitmap decodeResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options, boolean);
		method public static android.graphics.Bitmap decodeStream(java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options);
		method public static android.graphics.Bitmap decodeStream(java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options, boolean);
		method public static android.graphics.Bitmap decodeStream(java.io.InputStream);
		}

		@@ -15575,7 +15591,7 @@ package android.media {
		method public android.database.Cursor getCursor();
		method public static int getDefaultType(android.net.Uri);
		method public static android.net.Uri getDefaultUri(int);
		method public deprecated boolean getIncludeDrm();
		method public boolean getIncludeDrm();
		method public android.media.Ringtone getRingtone(int);
		method public static android.media.Ringtone getRingtone(android.content.Context, android.net.Uri);
		method public int getRingtonePosition(android.net.Uri);
		@@ -15585,14 +15601,14 @@ package android.media {
		method public int inferStreamType();
		method public static boolean isDefault(android.net.Uri);
		method public static void setActualDefaultRingtoneUri(android.content.Context, int, android.net.Uri);
		method public deprecated void setIncludeDrm(boolean);
		method public void setIncludeDrm(boolean);
		method public void setStopPreviousRingtone(boolean);
		method public void setType(int);
		method public void stopPreviousRingtone();
		field public static final java.lang.String ACTION_RINGTONE_PICKER = "android.intent.action.RINGTONE_PICKER";
		field public static final java.lang.String EXTRA_RINGTONE_DEFAULT_URI = "android.intent.extra.ringtone.DEFAULT_URI";
		field public static final java.lang.String EXTRA_RINGTONE_EXISTING_URI = "android.intent.extra.ringtone.EXISTING_URI";
		field public static final deprecated java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";
		field public static final java.lang.String EXTRA_RINGTONE_INCLUDE_DRM = "android.intent.extra.ringtone.INCLUDE_DRM";
		field public static final java.lang.String EXTRA_RINGTONE_PICKED_URI = "android.intent.extra.ringtone.PICKED_URI";
		field public static final java.lang.String EXTRA_RINGTONE_SHOW_DEFAULT = "android.intent.extra.ringtone.SHOW_DEFAULT";
		field public static final java.lang.String EXTRA_RINGTONE_SHOW_SILENT = "android.intent.extra.ringtone.SHOW_SILENT";

btobex/javax/btobex/ServerSession.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -285,11 +285,22 @@ public final class ServerSession extends ObexSession implements Runnable {
		if (VERBOSE) Log.v(TAG, "handlePutRequest pre != HTTP_OK sendReply");
		op.sendReply(response, false, false);
		} else if (!op.isAborted) {
		String nameHeader = (String)op.replyHeader.getHeader(HeaderSet.NAME);
		if (!op.finalBitSet && nameHeader != null) {
		if (VERBOSE) Log.v(TAG, "handlePutRequest Saved: "+nameHeader);
		//Donot Include NameHeader in CONTINUE
		op.replyHeader.setHeader(HeaderSet.NAME, null);
		}
		// wait for the final bit
		while (!op.finalBitSet) {
		if (VERBOSE) Log.v(TAG, "handlePutRequest pre looped sendReply");
		op.sendReply(ResponseCodes.OBEX_HTTP_CONTINUE, op.mSingleResponseActive, false);
		}
		if (nameHeader != null) {
		if (VERBOSE) Log.v(TAG, "handlePutRequest SETHeader: "+nameHeader);
		//PUT NameHeader in Final Packet
		op.replyHeader.setHeader(HeaderSet.NAME, nameHeader);
		}
		op.sendReply(response, false,false);
		}
		} catch (Exception e) {

cmds/bootanimation/BootAnimation.cpp

+16 −8

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ static pthread_mutex_t mp_lock;
		static pthread_cond_t mp_cond;
		static bool isMPlayerPrepared = false;
		static bool isMPlayerCompleted = false;
		static sp<MediaPlayer> mPlayer;

		class MPlayerListener : public MediaPlayerListener
		{
		@@ -812,6 +813,13 @@ bool BootAnimation::movie()
		pthread_mutex_unlock(&mp_lock);
		ALOGD("media player is completed.");

		if (mPlayer != NULL) {
		mPlayer->reset();
		// sleep for 200ms to ensure audio output used for
		// boot sound is stopped before process exit
		usleep(200*1000);
		}

		pthread_cond_destroy(&mp_cond);
		pthread_mutex_destroy(&mp_lock);

		@@ -898,15 +906,15 @@ void* playMusic(void* arg)
		{
		int index = 0;
		char fileName = (char )arg;
		sp<MediaPlayer> mp = new MediaPlayer();
		mPlayer = new MediaPlayer();
		sp<MPlayerListener> mListener = new MPlayerListener();
		if (mp != NULL) {
		if (mPlayer != NULL) {
		ALOGD("starting to play %s", fileName);
		mp->setListener(mListener);
		mPlayer->setListener(mListener);

		if (mp->setDataSource(NULL, fileName, NULL) == NO_ERROR) {
		mp->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE);
		mp->prepare();
		if (mPlayer->setDataSource(NULL, fileName, NULL) == NO_ERROR) {
		mPlayer->setAudioStreamType(AUDIO_STREAM_ENFORCED_AUDIBLE);
		mPlayer->prepare();
		} else {
		ALOGE("failed to setDataSource for %s", fileName);
		return NULL;
		@@ -926,8 +934,8 @@ void* playMusic(void* arg)
		AudioSystem::getStreamVolumeIndex(AUDIO_STREAM_ENFORCED_AUDIBLE, &index, device);
		if (index != 0) {
		ALOGD("playing %s", fileName);
		mp->seekTo(0);
		mp->start();
		mPlayer->seekTo(0);
		mPlayer->start();
		} else {
		ALOGW("current volume is zero.");
		}

cmds/idmap/create.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ namespace {
		int open_idmap(const char *path)
		{
		int fd = TEMP_FAILURE_RETRY(open(path, O_WRONLY \| O_CREAT \| O_TRUNC, 0644));
		bool needUnlink = true;
		if (fd == -1) {
		ALOGD("error: open %s: %s\n", path, strerror(errno));
		goto fail;
		@@ -50,6 +51,8 @@ namespace {
		}
		if (TEMP_FAILURE_RETRY(flock(fd, LOCK_EX \| LOCK_NB)) != 0) {
		ALOGD("error: flock %s: %s\n", path, strerror(errno));
		// If the file is locked by another process, then we needn't unlink the file.
		needUnlink = false;
		goto fail;
		}

		@@ -57,7 +60,7 @@ namespace {
		fail:
		if (fd != -1) {
		close(fd);
		unlink(path);
		if (needUnlink) unlink(path);
		}
		return -1;
		}