Commit Graph

159173 Commits

Author SHA1 Message Date
3476a2a0b2 am 564ec716: Merge "Track change to Conscrypt"
* commit '564ec716f4ac2f71d7d4e6eb481075603e183b4f':
  Track change to Conscrypt
2014-11-26 17:13:48 +00:00
564ec716f4 Merge "Track change to Conscrypt" 2014-11-26 17:09:40 +00:00
9d2d6b6b4b Track change to Conscrypt
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
2014-11-26 09:08:40 -08:00
edda97c9ff am fdbef408: Merge "Start MountService before performBootDexOpt"
* commit 'fdbef4081d715de59525d58d44881b00f616616f':
  Start MountService before performBootDexOpt
2014-11-26 11:05:46 +00:00
fdbef4081d Merge "Start MountService before performBootDexOpt" 2014-11-26 10:59:29 +00:00
76bf60ead8 APK still has privileged flag after being moved from "/system/priv-app"
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.

Change-Id: I7713382db34697f7b68283dbbbd25a1349cbecdb
2014-11-26 06:58:04 +00:00
827bb445d1 Fix NullPointerException in ListView
There is a NullPointerException in `handleHorizontalFocusWithinListItem()`
because `selectedView.findFocus()` returns null and then there is no null
check when when the assigned variable `currentFocus` is used, although
`View.findFocus()` states that it may return null.

Change-Id: I6897027e9a2a238d9283e6b9f5146198989fcac0
2014-11-26 06:56:10 +00:00
0735697c9d Fix Presentation window is removed on stack change
If an activity show a Presentation window and this activity is moved
to bottom or top, thus this Presentation window will be removed from
its display window list, and no chance to be added back into window
container; It will cause the incorrect state that Presentation window
is lost from secondary display window list(displayContent.mWindows),
but still exist in app token's window list(appWindowToken.allAppWindows);
Moreover, once this activity resume again, Presentation window is not
shown because it's lost.

In this way, don't remove non-target display app windows due to only
target(or called default) display windows are removed temporarily and
re-sorted then added back into window list later.

Change-Id: I8960ce191f6c662455cba5a0a5e6a1ff9ef03ae1
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 13:46:21 +08:00
b31cced065 Sync focus stack frame and layer with focus app.
Update focus stack frame/layer when focus app is changed to avoid
focus stack/layer isn't updated synchronously with focus app, it's
due to performLayoutAndPlaceSurfacesLocked() is not necessarily
called on focus app change; it will cause sending mismatching 
TAP_OUTSIDE_STACK message if there is effectual incoming pointer
event, hence may also result in focus stack is changed again,
therefore erroneous focus app is set by ActivityManager at final.

Change-Id: Ia0ec9a543be887b51a3b29b3e62fdd471c15edf2
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 05:34:06 +00:00
a901f57580 Not include fullscreen opaque window on screenshot
Extend the fullscreen meaning by adding opaque drawn check on
screenshot application; if there is a fullscreen window but not
opaque, we will continue finding behind windows; otherwise ending up
including behind windows. It's able to help avoiding capturing BLACK
screenshot bitmap.

Change-Id: I1c7e8f513c366688ea8001c3d0c799f3522f0ffd
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 04:11:34 +00:00
f2ad1a442b Measure absolute value of pointer motion distance
If pointer is moving to the negative axis direction, pointer movement
distance will always less than pre-defined mMotionSlop, thus
TAP_OUTSIDE_STACK will have chance to be sent, will cause unnecessary
focus stack switch.

Change-Id: Ia4c066bebce250257c7361ef976907a0ca2c6461
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 11:28:39 +08:00
5664546fc1 Fix bad exclude region in landscape
Update DisplayContent.mBaseDisplayRect when device orientation is
changed, it avoids to set incorrect initial value of
mTouchExcludeRegion, that will cause result of calculated
mTouchExcludeRegion becomes an incorrect strange region on
landscape orientation.

Change-Id: I993864653edc2852f91abed7891e6631b4bae15a
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-26 03:21:16 +00:00
f76d36f96b Prevent calling GL functions with an invalid surface
When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)

Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
2014-11-26 09:59:39 +09:00
bf62d3070c am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions"
* commit 'af5bd75b3d65fc710784f59d1c22c164312e2691':
  Enable stencil clipping within clearLayerRegions
2014-11-26 00:02:17 +00:00
af5bd75b3d Merge "Enable stencil clipping within clearLayerRegions" 2014-11-25 23:56:33 +00:00
f67cc14998 am 2657717f: Merge "We have POSIX clocks."
* commit '2657717f97e0de689aa3d8cae75bb0053607839d':
  We have POSIX clocks.
2014-11-25 23:23:45 +00:00
2657717f97 Merge "We have POSIX clocks." 2014-11-25 23:17:59 +00:00
42c569224a We have POSIX clocks.
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
2014-11-25 15:11:59 -08:00
ea1d90f5da [WebView] Allow the WebView to be compiled against the system SDK.
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
2014-11-25 17:03:49 +00:00
1b33b49723 Prevent showing immersive confirmation unexpectedly
By design, if the user presses the power key twice within 5 seconds
(panic), it will show immersive confirmation again at the next time
entering immersive mode.

But there is a bug on calculating the time between pressing the power
key. The time get from event.getDownTime() will stop when the device
is sleeping without being charged.

So here uses SystemClock.elapsedRealtime() instead.

https://code.google.com/p/android/issues/detail?id=80772

Change-Id: I4dca9dc260904f1c5b60464834781e2a82a9bcf4
2014-11-25 12:29:37 +00:00
c56c7013e3 Avoid overwriting EGL14.EGL_NO_SURFACE
(This is an update after the generator update.)

Both EGL14 and EGLExt have the same initialization codes for
EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY.
Since EGLExt is initialized later, they are overwritten by EGLExt's
initialization codes.
Therefore, EGL_NO_SURFACE returned by methods in EGL14 is not
actually EGL14.EGL_NO_SURFACE object and it makes several problems in
handling error cases.
For instance, "Let's fish" game application cannot be run on L.

To solve the problem, this patch makes EGL14.EGL_NO_SURFACE,
EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY initialized just once.

Change-Id: Icce878164ff0b715ad2b5a2cd038a9616c7cf1e9
2014-11-25 10:45:19 +09:00
chh
3ec380d365 am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"
* commit 'fc54573373ff965aa40cccdc1ab11c1c880c8930':
  Remove unused variables and functions, don't warn about unused parameters
2014-11-25 00:41:06 +00:00
chh
fc54573373 Merge "Remove unused variables and functions, don't warn about unused parameters" 2014-11-25 00:37:12 +00:00
43ea037b4c am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '481c4b641ea7d210396f16478c486cabf51db879':
  Fix class vs. struct mismatch
2014-11-25 00:24:23 +00:00
481c4b641e Merge "Fix class vs. struct mismatch" 2014-11-25 00:20:03 +00:00
99d61edfda Fix class vs. struct mismatch
Don't refer to classes as structs and view versa -- causes warnings in
clang (in code built with -Werror)

Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 16:18:15 -08:00
6cc39a475d am 613d2066: Merge "Fix unused variables."
* commit '613d20668a28f9dc970949c9efd2ca7f61bed6f4':
  Fix unused variables.
2014-11-25 00:00:22 +00:00
613d20668a Merge "Fix unused variables." 2014-11-24 23:53:36 +00:00
9c1c90e92e Fix unused variables.
The return value of jniRegisterNativeMethods is checked only in
LOG_FATAL_IF, which defines to nothing in the LOG_NDEBUG
case.

Fake a use of the 'res' variable to shut off warnings when LOG_NDEBUG.

Change-Id: I8263610f327c56897f76796fe1fbc2b325b0559f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 15:42:11 -08:00
73780ac392 am 38cc84de: Merge "Remove unused variable"
* commit '38cc84deceaf7bc9fab898cbcb37523cfba2bb66':
  Remove unused variable
2014-11-24 22:20:34 +00:00
38cc84dece Merge "Remove unused variable" 2014-11-24 22:15:42 +00:00
a3b1ea3336 am e57b3991: Merge "Remove unused function"
* commit 'e57b3991d85f22597014d74b64805a081cc978e0':
  Remove unused function
2014-11-24 20:20:21 +00:00
e57b3991d8 Merge "Remove unused function" 2014-11-24 20:15:13 +00:00
70363cc576 Remove unused function
Remove an unused static function clang complains about

Change-Id: Id5875960e9f93348c7a3a912f42b5f457af2cdc0
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 11:52:43 -08:00
98b8fe747a am 32ed090f: Merge "Stop using DATE_FORMAT from settings."
* commit '32ed090f5af4d533660759664f2542b99dbda7d9':
  Stop using DATE_FORMAT from settings.
2014-11-24 16:19:31 +00:00
68e9af7ba0 am 1d84709c: Merge "Stop reading Settings.System.DATE_FORMAT."
* commit '1d84709cf4d320a3e57cd16db144262b1fc2c3d7':
  Stop reading Settings.System.DATE_FORMAT.
2014-11-24 16:15:13 +00:00
32ed090f5a Merge "Stop using DATE_FORMAT from settings." 2014-11-24 16:14:33 +00:00
1d84709cf4 Merge "Stop reading Settings.System.DATE_FORMAT." 2014-11-24 16:10:02 +00:00
f91f06a599 Stop reading Settings.System.DATE_FORMAT.
Also, move over DateFormat.getInstance(SHORT) instead of
LocaleData.shortDateFormat4 (which forces 4 digit years).
Based on an analysis of git history, there seems to be no
real motiviation for using 4 digit years.

If anyone in the platform complains loudly, we could look at
using a skeleton pattern instead of just replacing 'y' with 'yy'.

If third party apps are affected, we could add a targetSdkversion
based check and revert to the old behaviour for older targetSdks.

bug: 18388178
bug: 18322220
Change-Id: Ieab2b41691958a2e668d382c5a6b3d9aaf741ed2
2014-11-24 16:05:19 +00:00
adc0d9da86 Enable stencil clipping within clearLayerRegions
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c240. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.

Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
2014-11-24 21:08:15 +09:00
57f637279a Add -Wno-unused-parameter to LOCAL_CFLAGS
Some JNI functions ignore the JNI environment and class information, but
still take the parameters -- causing a build failure with clang (and gcc
with -Wextra enabled). Ignore this.

Change-Id: I049fcf65991b19d2416fce105699311803b43cfc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-24 03:02:03 +01:00
00a2725683 Only one task within the stack should moveToBack
In case of the last stack of application move to back,
ONLY one stack within stack should move to back.
but stack itseft move to back.

Default bahavior of ActivityManager is that the stack will
go back within stack when the last stack of application move
to back. The stack is managed by DisplayContent of WindowManagerService
should be same but taking one more action that move stack itself.

Change-Id: If394ddf16b0fcda2ae3252e8f3b5336322ef6808
Signed-off-by: Seunghyun Lee <seunghyun85.lee@lge.com>
2014-11-24 09:55:11 +09:00
4048a4bcb1 Remove unused variables and functions, don't warn about unused parameters
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)

Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-23 22:24:32 +01:00
08e2fd7238 am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."
* commit 'ff4dd15cd024f72cbd2b6d547356de030b2dd71c':
  We HAVE_LITTLE_ENDIAN.
2014-11-22 07:50:58 +00:00
ff4dd15cd0 Merge "We HAVE_LITTLE_ENDIAN." 2014-11-22 07:47:27 +00:00
9d074a1fb7 We HAVE_LITTLE_ENDIAN.
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
2014-11-21 23:36:45 -08:00
50884b5b65 am f1058308: Merge "Add window to child window list with correct order"
* commit 'f1058308c62f297c5bca9e9baf8451efeb200805':
  Add window to child window list with correct order
2014-11-22 02:34:01 +00:00
f1058308c6 Merge "Add window to child window list with correct order" 2014-11-22 02:12:49 +00:00
05f7c39eb4 am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""
* commit 'fc4a7538a65449428e9d321deb6a413e19461c6c':
  Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
2014-11-22 00:31:07 +00:00
fc4a7538a6 Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" 2014-11-22 00:24:39 +00:00