diff options
| -rw-r--r-- | core/java/android/app/NativeActivity.java | 12 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothUuid.java | 2 | ||||
| -rw-r--r-- | core/jni/android/graphics/Bitmap.cpp | 9 | ||||
| -rw-r--r-- | core/jni/android_app_NativeActivity.cpp | 16 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java | 12 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/BarController.java | 186 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 215 | ||||
| -rw-r--r-- | services/input/InputReader.h | 3 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiMonitor.java | 31 |
9 files changed, 313 insertions, 173 deletions
diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java index b84889f..4ca3747 100644 --- a/core/java/android/app/NativeActivity.java +++ b/core/java/android/app/NativeActivity.java @@ -175,16 +175,20 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, ? savedInstanceState.getByteArray(KEY_NATIVE_SAVED_STATE) : null; mNativeHandle = loadNativeCode(path, funcname, Looper.myQueue(), - getFilesDir().getAbsolutePath(), getObbDir().getAbsolutePath(), - getExternalFilesDir(null).getAbsolutePath(), - Build.VERSION.SDK_INT, getAssets(), nativeSavedState); - + getAbsolutePath(getFilesDir()), getAbsolutePath(getObbDir()), + getAbsolutePath(getExternalFilesDir(null)), + Build.VERSION.SDK_INT, getAssets(), nativeSavedState); + if (mNativeHandle == 0) { throw new IllegalArgumentException("Unable to load native library: " + path); } super.onCreate(savedInstanceState); } + private static String getAbsolutePath(File file) { + return (file != null) ? file.getAbsolutePath() : null; + } + @Override protected void onDestroy() { mDestroyed = true; diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index fe66fbd..6609b98 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -56,6 +56,8 @@ public final class BluetoothUuid { ParcelUuid.fromString("00001105-0000-1000-8000-00805f9b34fb"); public static final ParcelUuid Hid = ParcelUuid.fromString("00001124-0000-1000-8000-00805f9b34fb"); + public static final ParcelUuid Hogp = + ParcelUuid.fromString("00001812-0000-1000-8000-00805f9b34fb"); public static final ParcelUuid PANU = ParcelUuid.fromString("00001115-0000-1000-8000-00805F9B34FB"); public static final ParcelUuid NAP = diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index b03d12a..0ea3bf7 100644 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -222,8 +222,12 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors, }
}
- SkBitmap bitmap;
+ // ARGB_4444 is a deprecated format, convert automatically to 8888
+ if (config == SkBitmap::kARGB_4444_Config) {
+ config = SkBitmap::kARGB_8888_Config;
+ }
+ SkBitmap bitmap;
bitmap.setConfig(config, width, height);
jbyteArray buff = GraphicsJNI::allocateJavaPixelRef(env, &bitmap, NULL);
@@ -232,8 +236,7 @@ static jobject Bitmap_creator(JNIEnv* env, jobject, jintArray jColors, }
if (jColors != NULL) {
- GraphicsJNI::SetPixels(env, jColors, offset, stride,
- 0, 0, width, height, bitmap);
+ GraphicsJNI::SetPixels(env, jColors, offset, stride, 0, 0, width, height, bitmap);
}
return GraphicsJNI::createBitmap(env, new SkBitmap(bitmap), buff, isMutable, NULL, NULL);
diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index f768ce8..5418006 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -306,19 +306,23 @@ loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName code->internalDataPath = code->internalDataPathObj.string(); env->ReleaseStringUTFChars(internalDataDir, dirStr); - dirStr = env->GetStringUTFChars(externalDataDir, NULL); - code->externalDataPathObj = dirStr; + if (externalDataDir != NULL) { + dirStr = env->GetStringUTFChars(externalDataDir, NULL); + code->externalDataPathObj = dirStr; + env->ReleaseStringUTFChars(externalDataDir, dirStr); + } code->externalDataPath = code->externalDataPathObj.string(); - env->ReleaseStringUTFChars(externalDataDir, dirStr); code->sdkVersion = sdkVersion; code->assetManager = assetManagerForJavaObject(env, jAssetMgr); - dirStr = env->GetStringUTFChars(obbDir, NULL); - code->obbPathObj = dirStr; + if (obbDir != NULL) { + dirStr = env->GetStringUTFChars(obbDir, NULL); + code->obbPathObj = dirStr; + env->ReleaseStringUTFChars(obbDir, dirStr); + } code->obbPath = code->obbPathObj.string(); - env->ReleaseStringUTFChars(obbDir, dirStr); jbyte* rawSavedState = NULL; jsize rawSavedSize = 0; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java index 74b14b0..199c65a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java @@ -21,16 +21,19 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import android.util.Log; import android.view.View; import com.android.systemui.R; public class BarTransitions { + private static final boolean DEBUG = false; public static final int MODE_NORMAL = 0; public static final int MODE_TRANSIENT = 1; public static final int MODE_TRANSPARENT = 2; + private final String mTag; private final View mTarget; private final Drawable mOpaque; private final Drawable mTransient; @@ -39,6 +42,7 @@ public class BarTransitions { private int mMode; public BarTransitions(Context context, View target, Drawable transparent) { + mTag = "BarTransitions." + target.getClass().getSimpleName(); mTarget = target; final Resources res = context.getResources(); mOpaque = new ColorDrawable(res.getColor(R.drawable.status_bar_background)); @@ -56,9 +60,17 @@ public class BarTransitions { public void transitionTo(int mode) { mMode = mode; if (!ActivityManager.isHighEndGfx()) return; + if (DEBUG) Log.d(mTag, "transitionTo " + modeToString(mode)); Drawable background = mode == MODE_TRANSIENT ? mTransient : mode == MODE_TRANSPARENT ? mTransparent : mOpaque; mTarget.setBackground(background); } + + public static String modeToString(int mode) { + if (mode == MODE_NORMAL) return "MODE_NORMAL"; + if (mode == MODE_TRANSIENT) return "MODE_TRANSIENT"; + if (mode == MODE_TRANSPARENT) return "MODE_TRANSPARENT"; + throw new IllegalArgumentException("Unknown mode " + mode); + } } diff --git a/policy/src/com/android/internal/policy/impl/BarController.java b/policy/src/com/android/internal/policy/impl/BarController.java new file mode 100644 index 0000000..fb76e20 --- /dev/null +++ b/policy/src/com/android/internal/policy/impl/BarController.java @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2013 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. + */ + +package com.android.internal.policy.impl; + +import android.app.StatusBarManager; +import android.os.Handler; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.util.Slog; +import android.view.View; +import android.view.WindowManagerPolicy.WindowState; + +import com.android.internal.statusbar.IStatusBarService; + +import java.io.PrintWriter; + +/** + * Controls state/behavior specific to a system bar window. + */ +public class BarController { + private static final boolean DEBUG = false; + + private static final int TRANSIENT_BAR_NONE = 0; + private static final int TRANSIENT_BAR_SHOWING = 1; + private static final int TRANSIENT_BAR_HIDING = 2; + + private final String mTag; + private final int mTransientFlag; + private final int mStatusBarManagerId; + private final Handler mHandler; + private final Object mServiceAquireLock = new Object(); + private IStatusBarService mStatusBarService; + + private WindowState mWin; + private int mTransientBarState; + private boolean mPendingShow; + + public BarController(String tag, int transientFlag, int statusBarManagerId) { + mTag = "BarController." + tag; + mTransientFlag = transientFlag; + mStatusBarManagerId = statusBarManagerId; + mHandler = new Handler(); + } + + public void setWindow(WindowState win) { + mWin = win; + } + + public void showTransient() { + if (mWin != null) { + setTransientBarState(TRANSIENT_BAR_SHOWING); + } + } + + public boolean isTransientShowing() { + return mTransientBarState == TRANSIENT_BAR_SHOWING; + } + + public void adjustSystemUiVisibilityLw(int visibility) { + if (mWin != null && mTransientBarState == TRANSIENT_BAR_SHOWING && + (visibility & mTransientFlag) == 0) { + setTransientBarState(TRANSIENT_BAR_HIDING); + setBarShowingLw(false); + } + } + + public boolean setBarShowingLw(final boolean show) { + if (mWin == null) return false; + + mHandler.post(new Runnable() { + @Override + public void run() { + try { + IStatusBarService statusbar = getStatusBarService(); + if (statusbar != null) { + statusbar.setWindowState(mStatusBarManagerId, show + ? StatusBarManager.WINDOW_STATE_SHOWING + : StatusBarManager.WINDOW_STATE_HIDING); + } + } catch (RemoteException e) { + // re-acquire status bar service next time it is needed. + mStatusBarService = null; + } + } + }); + if (show && mTransientBarState == TRANSIENT_BAR_HIDING) { + mPendingShow = true; + return false; + } + return show ? mWin.showLw(true) : mWin.hideLw(true); + } + + public boolean checkHiddenLw() { + if (mWin != null && mTransientBarState == TRANSIENT_BAR_HIDING && !mWin.isVisibleLw()) { + // Finished animating out, clean up and reset style + setTransientBarState(TRANSIENT_BAR_NONE); + if (mPendingShow) { + setBarShowingLw(true); + mPendingShow = false; + } + return true; + } + return false; + } + + public boolean checkShowTransientBarLw() { + if (mTransientBarState == TRANSIENT_BAR_SHOWING) { + if (DEBUG) Slog.d(mTag, "Not showing transient bar, already shown"); + return false; + } else if (mWin == null) { + if (DEBUG) Slog.d(mTag, "Not showing transient bar, bar doesn't exist"); + return false; + } else if (mWin.isDisplayedLw()) { + if (DEBUG) Slog.d(mTag, "Not showing transient bar, bar already visible"); + return false; + } else { + return true; + } + } + + public int updateVisibilityLw(boolean allowed, int oldVis, int vis) { + if (mWin == null) return vis; + + if (mTransientBarState == TRANSIENT_BAR_SHOWING) { // transient bar requested + if (allowed) { + vis |= mTransientFlag; + if ((oldVis & mTransientFlag) == 0) { + setBarShowingLw(true); + } + } else { + setTransientBarState(TRANSIENT_BAR_NONE); // request denied + } + } + if (mTransientBarState != TRANSIENT_BAR_NONE) { + vis |= mTransientFlag; // ignore clear requests until transition completes + vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; // never show transient bars in low profile + } + return vis; + } + + private void setTransientBarState(int state) { + if (mWin != null && state != mTransientBarState) { + mTransientBarState = state; + if (DEBUG) Slog.d(mTag, "New state: " + transientBarStateToString(state)); + } + } + + private IStatusBarService getStatusBarService() { + synchronized (mServiceAquireLock) { + if (mStatusBarService == null) { + mStatusBarService = IStatusBarService.Stub.asInterface( + ServiceManager.getService("statusbar")); + } + return mStatusBarService; + } + } + + private static String transientBarStateToString(int state) { + if (state == TRANSIENT_BAR_HIDING) return "TRANSIENT_BAR_HIDING"; + if (state == TRANSIENT_BAR_SHOWING) return "TRANSIENT_BAR_SHOWING"; + if (state == TRANSIENT_BAR_NONE) return "TRANSIENT_BAR_NONE"; + throw new IllegalArgumentException("Unknown state " + state); + } + + public void dump(PrintWriter pw, String prefix) { + if (mWin != null) { + pw.print(prefix); pw.print(mTag); pw.print(' '); + pw.print("mTransientBar"); pw.print('='); + pw.println(transientBarStateToString(mTransientBarState)); + } + } +} diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 22b5f03..11e33dc 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -553,11 +553,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { } MyOrientationListener mOrientationListener; - private static final int TRANSIENT_BAR_NONE = 0; - private static final int TRANSIENT_BAR_SHOWING = 1; - private static final int TRANSIENT_BAR_HIDING = 2; - private int mStatusTransientBar; - private int mNavigationTransientBar; + private final BarController mStatusBarController = new BarController("StatusBar", + View.STATUS_BAR_TRANSIENT, StatusBarManager.WINDOW_STATUS_BAR); + private final BarController mNavigationBarController = new BarController("NavigationBar", + View.NAVIGATION_BAR_TRANSIENT, StatusBarManager.WINDOW_NAVIGATION_BAR); private TransientNavigationConfirmation mTransientNavigationConfirmation; private SystemGesturesPointerEventListener mSystemGestures; @@ -1716,6 +1715,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } mStatusBar = win; + mStatusBarController.setWindow(win); break; case TYPE_NAVIGATION_BAR: mContext.enforceCallingOrSelfPermission( @@ -1727,6 +1727,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } mNavigationBar = win; + mNavigationBarController.setWindow(win); if (DEBUG_LAYOUT) Slog.i(TAG, "NAVIGATION BAR: " + mNavigationBar); break; case TYPE_NAVIGATION_BAR_PANEL: @@ -1765,6 +1766,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { public void removeWindowLw(WindowState win) { if (mStatusBar == win) { mStatusBar = null; + mStatusBarController.setWindow(null); } else if (mKeyguard == win) { Log.v(TAG, "Removing keyguard window (Did it crash?)"); mKeyguard = null; @@ -1774,6 +1776,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mKeyguardScrim = null; } if (mNavigationBar == win) { mNavigationBar = null; + mNavigationBarController.setWindow(null); } } @@ -2548,16 +2551,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public int adjustSystemUiVisibilityLw(int visibility) { - if (mStatusBar != null && mStatusTransientBar == TRANSIENT_BAR_SHOWING && - 0 == (visibility & View.STATUS_BAR_TRANSIENT)) { - mStatusTransientBar = TRANSIENT_BAR_HIDING; - setBarShowingLw(mStatusBar, false); - } - if (mNavigationBar != null && mNavigationTransientBar == TRANSIENT_BAR_SHOWING && - 0 == (visibility & View.NAVIGATION_BAR_TRANSIENT)) { - mNavigationTransientBar = TRANSIENT_BAR_HIDING; - setBarShowingLw(mNavigationBar, false); - } + mStatusBarController.adjustSystemUiVisibilityLw(visibility); + mNavigationBarController.adjustSystemUiVisibilityLw(visibility); + // Reset any bits in mForceClearingStatusBarVisibility that // are now clear. mResettingSystemUiFlags &= visibility; @@ -2714,7 +2710,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { boolean updateSysUiVisibility = false; if (mNavigationBar != null) { - boolean transientNavBarShowing = mNavigationTransientBar == TRANSIENT_BAR_SHOWING; + boolean transientNavBarShowing = mNavigationBarController.isTransientShowing(); // Force the navigation bar to its appropriate place and // size. We need to do this directly, instead of relying on // it to bubble up from the nav bar, because this needs to @@ -2727,15 +2723,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { mTmpNavigationFrame.set(0, top, displayWidth, displayHeight - overscanBottom); mStableBottom = mStableFullscreenBottom = mTmpNavigationFrame.top; if (transientNavBarShowing || navTransparent) { - setBarShowingLw(mNavigationBar, true); + mNavigationBarController.setBarShowingLw(true); } else if (navVisible) { - setBarShowingLw(mNavigationBar, true); + mNavigationBarController.setBarShowingLw(true); mDockBottom = mTmpNavigationFrame.top; mRestrictedScreenHeight = mDockBottom - mRestrictedScreenTop; mRestrictedOverscanScreenHeight = mDockBottom - mRestrictedOverscanScreenTop; } else { // We currently want to hide the navigation UI. - setBarShowingLw(mNavigationBar, false); + mNavigationBarController.setBarShowingLw(false); } if (navVisible && !navTransparent && !mNavigationBar.isAnimatingLw()) { // If the opaque nav bar is currently requested to be visible, @@ -2750,15 +2746,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { mTmpNavigationFrame.set(left, 0, displayWidth - overscanRight, displayHeight); mStableRight = mStableFullscreenRight = mTmpNavigationFrame.left; if (transientNavBarShowing || navTransparent) { - setBarShowingLw(mNavigationBar, true); + mNavigationBarController.setBarShowingLw(true); } else if (navVisible) { - setBarShowingLw(mNavigationBar, true); + mNavigationBarController.setBarShowingLw(true); mDockRight = mTmpNavigationFrame.left; mRestrictedScreenWidth = mDockRight - mRestrictedScreenLeft; mRestrictedOverscanScreenWidth = mDockRight - mRestrictedOverscanScreenLeft; } else { // We currently want to hide the navigation UI. - setBarShowingLw(mNavigationBar, false); + mNavigationBarController.setBarShowingLw(false); } if (navVisible && !navTransparent && !mNavigationBar.isAnimatingLw()) { // If the nav bar is currently requested to be visible, @@ -2778,9 +2774,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mNavigationBar.computeFrameLw(mTmpNavigationFrame, mTmpNavigationFrame, mTmpNavigationFrame, mTmpNavigationFrame, mTmpNavigationFrame); if (DEBUG_LAYOUT) Slog.i(TAG, "mNavigationBar frame: " + mTmpNavigationFrame); - if (mNavigationTransientBar == TRANSIENT_BAR_HIDING && !mNavigationBar.isVisibleLw()) { - // Finished animating out, clean up and reset alpha - mNavigationTransientBar = TRANSIENT_BAR_NONE; + if (mNavigationBarController.checkHiddenLw()) { updateSysUiVisibility = true; } } @@ -2838,10 +2832,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // we can tell the app that it is covered by it. mSystemTop = mUnrestrictedScreenTop + mStatusBarHeight; } - - if (mStatusTransientBar == TRANSIENT_BAR_HIDING && !mStatusBar.isVisibleLw()) { - // Finished animating out, clean up and reset alpha - mStatusTransientBar = TRANSIENT_BAR_NONE; + if (mStatusBarController.checkHiddenLw()) { updateSysUiVisibility = true; } } @@ -3410,7 +3401,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { + " top=" + mTopFullscreenOpaqueWindowState); if (mForceStatusBar || mForceStatusBarFromKeyguard) { if (DEBUG_LAYOUT) Slog.v(TAG, "Showing status bar: forced"); - if (setBarShowingLw(mStatusBar, true)) changes |= FINISH_LAYOUT_REDO_LAYOUT; + if (mStatusBarController.setBarShowingLw(true)) { + changes |= FINISH_LAYOUT_REDO_LAYOUT; + } } else if (mTopFullscreenOpaqueWindowState != null) { if (localLOGV) { Slog.d(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw() @@ -3424,20 +3417,22 @@ public class PhoneWindowManager implements WindowManagerPolicy { // and mTopIsFullscreen is that that mTopIsFullscreen is set only if the window // has the FLAG_FULLSCREEN set. Not sure if there is another way that to be the // case though. - if (mStatusTransientBar == TRANSIENT_BAR_SHOWING) { - if (setBarShowingLw(mStatusBar, true)) { + if (mStatusBarController.isTransientShowing()) { + if (mStatusBarController.setBarShowingLw(true)) { changes |= FINISH_LAYOUT_REDO_LAYOUT; } } else if (topIsFullscreen) { if (DEBUG_LAYOUT) Slog.v(TAG, "** HIDING status bar"); - if (setBarShowingLw(mStatusBar, false)) { + if (mStatusBarController.setBarShowingLw(false)) { changes |= FINISH_LAYOUT_REDO_LAYOUT; } else { if (DEBUG_LAYOUT) Slog.v(TAG, "Status bar already hiding"); } } else { if (DEBUG_LAYOUT) Slog.v(TAG, "** SHOWING status bar: top is not fullscreen"); - if (setBarShowingLw(mStatusBar, true)) changes |= FINISH_LAYOUT_REDO_LAYOUT; + if (mStatusBarController.setBarShowingLw(true)) { + changes |= FINISH_LAYOUT_REDO_LAYOUT; + } } } } @@ -3882,7 +3877,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_POWER: { result &= ~ACTION_PASS_TO_USER; if (down) { - if (isScreenOn && isNavigationBarTransient(mLastSystemUiFlags)) { + if (isScreenOn && isTransientNavigationAllowed(mLastSystemUiFlags)) { mTransientNavigationConfirmation.unconfirmLastPackage(); } if (isScreenOn && !mPowerKeyTriggered @@ -4153,36 +4148,21 @@ public class PhoneWindowManager implements WindowManagerPolicy { private void requestTransientBars(WindowState swipeTarget) { synchronized (mWindowManagerFuncs.getWindowManagerLock()) { - boolean sb = checkShowTransientBar("status", mStatusTransientBar, mStatusBar); - boolean nb = checkShowTransientBar("nav", mNavigationTransientBar, mNavigationBar); + boolean sb = mStatusBarController.checkShowTransientBarLw(); + boolean nb = mNavigationBarController.checkShowTransientBarLw(); if (sb || nb) { WindowState barTarget = sb ? mStatusBar : mNavigationBar; if (sb ^ nb && barTarget != swipeTarget) { if (DEBUG) Slog.d(TAG, "Not showing transient bar, wrong swipe target"); return; } - mStatusTransientBar = sb ? TRANSIENT_BAR_SHOWING : mStatusTransientBar; - mNavigationTransientBar = nb ? TRANSIENT_BAR_SHOWING : mNavigationTransientBar; + if (sb) mStatusBarController.showTransient(); + if (nb) mNavigationBarController.showTransient(); updateSystemUiVisibilityLw(); } } } - private boolean checkShowTransientBar(String tag, int transientBar, WindowState win) { - if (transientBar == TRANSIENT_BAR_SHOWING) { - if (DEBUG) Slog.d(TAG, "Not showing " + tag + " transient bar, already shown"); - return false; - } else if (win == null) { - if (DEBUG) Slog.d(TAG, "Not showing " + tag + " transient bar, bar doesn't exist"); - return false; - } else if (win.isDisplayedLw()) { - if (DEBUG) Slog.d(TAG, "Not showing " + tag + " transient bar, bar already visible"); - return false; - } else { - return true; - } - } - @Override public void screenTurnedOff(int why) { EventLog.writeEvent(70000, 0); @@ -5057,106 +5037,62 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (ImmersiveModeTesting.enabled) { vis = ImmersiveModeTesting.applyForced(mFocusedWindow, vis); } + + // prevent status bar interaction from clearing certain flags boolean statusBarHasFocus = mFocusedWindow.getAttrs().type == TYPE_STATUS_BAR; if (statusBarHasFocus) { - // prevent status bar interaction from clearing certain flags int flags = View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT; vis = (vis & ~flags) | (mLastSystemUiFlags & flags); } - if (mStatusTransientBar == TRANSIENT_BAR_SHOWING) { - // status transient bar requested - boolean transientAllowed = - (vis & View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT) != 0; - boolean hideStatusBarWM = - (mFocusedWindow.getAttrs().flags - & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0; - boolean hideStatusBarSysui = - (vis & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0; - - boolean transientStatusBarAllowed = - hideStatusBarWM - || (hideStatusBarSysui && transientAllowed) - || statusBarHasFocus; - - if (mStatusBar == null || !transientStatusBarAllowed) { - mStatusTransientBar = TRANSIENT_BAR_NONE; - if (mStatusBar != null && hideStatusBarSysui) { - // clear the clearable flags instead - int newVal = mResettingSystemUiFlags | View.SYSTEM_UI_CLEARABLE_FLAGS; - if (newVal != mResettingSystemUiFlags) { - mResettingSystemUiFlags = newVal; - mWindowManagerFuncs.reevaluateStatusBarVisibility(); - } - } - } else { - // show status transient bar - vis |= View.STATUS_BAR_TRANSIENT; - if ((mLastSystemUiFlags & View.STATUS_BAR_TRANSIENT) == 0) { - vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; - setBarShowingLw(mStatusBar, true); - } + + // update status bar + boolean transientAllowed = + (vis & View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT) != 0; + boolean hideStatusBarWM = + (mFocusedWindow.getAttrs().flags + & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0; + boolean hideStatusBarSysui = + (vis & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0; + + boolean transientStatusBarAllowed = + mStatusBar != null && ( + hideStatusBarWM + || (hideStatusBarSysui && transientAllowed) + || statusBarHasFocus); + + if (mStatusBarController.isTransientShowing() + && !transientStatusBarAllowed && hideStatusBarSysui) { + // clear the clearable flags instead + int newVal = mResettingSystemUiFlags | View.SYSTEM_UI_CLEARABLE_FLAGS; + if (newVal != mResettingSystemUiFlags) { + mResettingSystemUiFlags = newVal; + mWindowManagerFuncs.reevaluateStatusBarVisibility(); } } - boolean oldTransientNav = isNavigationBarTransient(oldVis); - boolean isTransientNav = isNavigationBarTransient(vis); + + vis = mStatusBarController.updateVisibilityLw(transientStatusBarAllowed, oldVis, vis); + + // update navigation bar + boolean oldTransientNav = isTransientNavigationAllowed(oldVis); + boolean isTransientNav = isTransientNavigationAllowed(vis); if (mFocusedWindow != null && oldTransientNav != isTransientNav) { final int uid = getCurrentUserId(); final String pkg = mFocusedWindow.getOwningPackage(); mTransientNavigationConfirmation.transientNavigationChanged(uid, pkg, isTransientNav); } - if (mNavigationTransientBar == TRANSIENT_BAR_SHOWING) { - // navigation transient bar requested - if (!isTransientNav) { - mNavigationTransientBar = TRANSIENT_BAR_NONE; - } else { - // show navigation transient bar - vis |= View.NAVIGATION_BAR_TRANSIENT; - if ((mLastSystemUiFlags & View.NAVIGATION_BAR_TRANSIENT) == 0) { - setBarShowingLw(mNavigationBar, true); - } - } - } - if (mStatusTransientBar != TRANSIENT_BAR_NONE - || mNavigationTransientBar != TRANSIENT_BAR_NONE) { - vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; - } + vis = mNavigationBarController.updateVisibilityLw(isTransientNav, oldVis, vis); + return vis; } - private boolean isNavigationBarTransient(int vis) { + private boolean isTransientNavigationAllowed(int vis) { return mNavigationBar != null && (vis & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0 && (vis & View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT) != 0; } - private boolean setBarShowingLw(WindowState win, final boolean show) { - final int window = - win == mStatusBar ? StatusBarManager.WINDOW_STATUS_BAR - : win == mNavigationBar ? StatusBarManager.WINDOW_NAVIGATION_BAR - : 0; - if (window != 0) { - mHandler.post(new Runnable() { - @Override - public void run() { - try { - IStatusBarService statusbar = getStatusBarService(); - if (statusbar != null) { - statusbar.setWindowState(window, show - ? StatusBarManager.WINDOW_STATE_SHOWING - : StatusBarManager.WINDOW_STATE_HIDING); - } - } catch (RemoteException e) { - // re-acquire status bar service next time it is needed. - mStatusBarService = null; - } - } - }); - } - return show ? win.showLw(true) : win.hideLw(true); - } - // Temporary helper that allows testing immersive mode on existing apps // TODO remove private static final class ImmersiveModeTesting { @@ -5417,18 +5353,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(prefix); pw.print("mDemoHdmiRotation="); pw.print(mDemoHdmiRotation); pw.print(" mDemoHdmiRotationLock="); pw.println(mDemoHdmiRotationLock); pw.print(prefix); pw.print("mUndockedHdmiRotation="); pw.println(mUndockedHdmiRotation); - dumpTransient(pw, prefix, - mStatusBar, "mStatusTransientBar", mStatusTransientBar); - dumpTransient(pw, prefix, - mNavigationBar, "mNavigationTransientBar", mNavigationTransientBar); - } - - private void dumpTransient(PrintWriter pw, String pre, WindowState win, String var, int val) { - if (win != null) { - pw.print(pre); pw.print(var); pw.print('='); - pw.println(val == TRANSIENT_BAR_HIDING ? "HIDING" - : val == TRANSIENT_BAR_SHOWING ? "SHOWING" - : "NONE"); - } + mStatusBarController.dump(pw, prefix); + mNavigationBarController.dump(pw, prefix); } } diff --git a/services/input/InputReader.h b/services/input/InputReader.h index 98daaf5..a8bb636 100644 --- a/services/input/InputReader.h +++ b/services/input/InputReader.h @@ -1285,6 +1285,9 @@ protected: if (haveSizeBias) { *outSize += sizeBias; } + if (*outSize < 0) { + *outSize = 0; + } } } mCalibration; diff --git a/wifi/java/android/net/wifi/WifiMonitor.java b/wifi/java/android/net/wifi/WifiMonitor.java index f6d5c98..a80238b 100644 --- a/wifi/java/android/net/wifi/WifiMonitor.java +++ b/wifi/java/android/net/wifi/WifiMonitor.java @@ -506,13 +506,14 @@ public class WifiMonitor { Log.d(TAG, "Event [" + eventStr + "]"); } + String iface = "p2p0"; WifiMonitor m = null; mStateMachine = null; if (eventStr.startsWith("IFNAME=")) { int space = eventStr.indexOf(' '); if (space != -1) { - String iface = eventStr.substring(7,space); + iface = eventStr.substring(7,space); m = mWifiMonitorSingleton.getMonitor(iface); if (m == null && iface.startsWith("p2p-")) { // p2p interfaces are created dynamically, but we have @@ -520,20 +521,20 @@ public class WifiMonitor { // for it explicitly, and send messages there .. m = mWifiMonitorSingleton.getMonitor("p2p0"); } - if (m != null) { - if (m.mMonitoring) { - mStateMachine = m.mWifiStateMachine; - eventStr = eventStr.substring(space + 1); - } - else { - if (DBG) Log.d(TAG, "Dropping event because monitor (" + iface + - ") is stopped"); - continue; - } - } - else { - eventStr = eventStr.substring(space + 1); - } + eventStr = eventStr.substring(space + 1); + } + } else { + // events without prefix belong to p2p0 monitor + m = mWifiMonitorSingleton.getMonitor("p2p0"); + } + + if (m != null) { + if (m.mMonitoring) { + mStateMachine = m.mWifiStateMachine; + } else { + if (DBG) Log.d(TAG, "Dropping event because monitor (" + iface + + ") is stopped"); + continue; } } |