summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk2
-rw-r--r--api/current.txt3
-rw-r--r--core/java/android/hardware/Camera.java3
-rw-r--r--core/java/android/nfc/NfcFragment.java5
-rwxr-xr-xcore/java/android/provider/Telephony.java3
-rw-r--r--docs/html/resources/resources-data.js10
-rw-r--r--libs/rs/rsContext.cpp1
-rw-r--r--media/java/android/media/AudioService.java6
8 files changed, 12 insertions, 21 deletions
diff --git a/Android.mk b/Android.mk
index 720920614a3d..586eb4ac01ec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -396,8 +396,6 @@ sample_dir := development/samples
# (see development/build/sdk.atree)
web_docs_sample_code_flags := \
-hdf android.hasSamples 1 \
- -samplecode $(sample_dir)/AccessibilityService \
- resources/samples/AccessibilityService "Accessibility Service" \
-samplecode $(sample_dir)/AccelerometerPlay \
resources/samples/AccelerometerPlay "Accelerometer Play" \
-samplecode $(sample_dir)/ActionBarCompat \
diff --git a/api/current.txt b/api/current.txt
index 8654f67d4b41..c4dd900aff0a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9366,6 +9366,7 @@ package android.hardware {
method public java.util.List<android.hardware.Camera.Size> getSupportedVideoSizes();
method public java.util.List<java.lang.String> getSupportedWhiteBalance();
method public float getVerticalViewAngle();
+ method public boolean getVideoStabilization();
method public java.lang.String getWhiteBalance();
method public int getZoom();
method public java.util.List<java.lang.Integer> getZoomRatios();
@@ -9373,6 +9374,7 @@ package android.hardware {
method public boolean isAutoWhiteBalanceLockSupported();
method public boolean isSmoothZoomSupported();
method public boolean isVideoSnapshotSupported();
+ method public boolean isVideoStabilizationSupported();
method public boolean isZoomSupported();
method public void remove(java.lang.String);
method public void removeGpsData();
@@ -9404,6 +9406,7 @@ package android.hardware {
method public void setRecordingHint(boolean);
method public void setRotation(int);
method public void setSceneMode(java.lang.String);
+ method public void setVideoStabilization(boolean);
method public void setWhiteBalance(java.lang.String);
method public void setZoom(int);
method public void unflatten(java.lang.String);
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index caad6fde9436..93a1b6ccb44b 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -3256,7 +3256,6 @@ public class Camera {
* disable video stabilization.
* @see #isVideoStabilizationSupported()
* @see #getVideoStabilization()
- * @hide
*/
public void setVideoStabilization(boolean toggle) {
set(KEY_VIDEO_STABILIZATION, toggle ? TRUE : FALSE);
@@ -3269,7 +3268,6 @@ public class Camera {
* @return true if video stabilization is enabled
* @see #isVideoStabilizationSupported()
* @see #setVideoStabilization(boolean)
- * @hide
*/
public boolean getVideoStabilization() {
String str = get(KEY_VIDEO_STABILIZATION);
@@ -3283,7 +3281,6 @@ public class Camera {
* @return true if video stabilization is supported
* @see #setVideoStabilization(boolean)
* @see #getVideoStabilization()
- * @hide
*/
public boolean isVideoStabilizationSupported() {
String str = get(KEY_VIDEO_STABILIZATION_SUPPORTED);
diff --git a/core/java/android/nfc/NfcFragment.java b/core/java/android/nfc/NfcFragment.java
index 17278dc04cc7..d6b15ad1bf5a 100644
--- a/core/java/android/nfc/NfcFragment.java
+++ b/core/java/android/nfc/NfcFragment.java
@@ -48,7 +48,10 @@ public final class NfcFragment extends Fragment {
FragmentManager manager = activity.getFragmentManager();
Fragment fragment = manager.findFragmentByTag(FRAGMENT_TAG);
if (fragment != null) {
- manager.beginTransaction().remove(fragment).commit();
+ // We allow state loss at this point, because the state is only
+ // lost when activity is being paused *AND* subsequently destroyed.
+ // In that case, the app will setup foreground dispatch again anyway.
+ manager.beginTransaction().remove(fragment).commitAllowingStateLoss();
}
}
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 79995d05dd09..0e6d07d8dd18 100755
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1271,9 +1271,6 @@ public final class Telephony {
Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
uri, ID_PROJECTION, null, null, null);
- if (DEBUG) {
- Log.v(TAG, "getOrCreateThreadId cursor cnt: " + cursor.getCount());
- }
if (cursor != null) {
try {
if (cursor.moveToFirst()) {
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 164bd16669b5..237e18cfadd6 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -398,16 +398,6 @@ var ANDROID_RESOURCES = [
}
},
{
- tags: ['sample', 'accessibility'],
- path: 'samples/AccessibilityService/index.html',
- title: {
- en: 'Accessibility Service'
- },
- description: {
- en: 'Illustrates an accessibility service that provides custom feedback for the Clock application which comes by default with Android devices'
- }
- },
- {
tags: ['sample', 'new', 'ui', 'compatibility', 'newfeature'],
path: 'samples/ActionBarCompat/index.html',
title: {
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 948ecf90a732..5291a1f73f2e 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -359,6 +359,7 @@ Context::Context() {
mTargetSdkVersion = 14;
mDPI = 96;
mIsContextLite = false;
+ memset(&watchdog, 0, sizeof(watchdog));
}
Context * Context::createContext(Device *dev, const RsSurfaceConfig *sc) {
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index 25a37058a0be..2f32bd803ee6 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1635,8 +1635,10 @@ public class AudioService extends IAudioService.Stub {
// "silent mode", but which one?
newRingerMode = vibeInSilent ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT;
}
- if (uiIndex == 0 || (mPrevVolDirection == AudioManager.ADJUST_LOWER &&
- mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {
+ if (uiIndex == 0 ||
+ (!vibeInSilent &&
+ mPrevVolDirection == AudioManager.ADJUST_LOWER &&
+ mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {
adjustVolumeIndex = false;
}
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-06 15:23:41 +0000