159085 Commits

Author SHA1 Message Date
dcashman
fe8afa99a7 Prevent EntropyMixer from registering with service manager.
EntropyMixer is designed to be triggered in two ways, as either the
result of a self-set timer or of one of three system broadcasts.  It is not
meant to be triggered in any other way, so exposing it via servicemanager
is undesirable.

Bug: 18106000

Cherry-pick of commit: 9287e0dd272b85b475e33bcbd7d868517a0f98f9

Change-Id: I9aeb35e7ffde75090f4234ea193514fb883b1425
2014-11-26 13:50:30 -08:00
Craig Mautner
980ce4bad0 am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."
* commit '200496b5714675a31376e78977713fcbad775fb5':
  ANR caused by incorrect cleanup in BroadcastQueue.
2014-11-26 21:47:35 +00:00
Craig Mautner
200496b571 Merge "ANR caused by incorrect cleanup in BroadcastQueue." 2014-11-26 21:43:59 +00:00
Guobin Zhang
04d0bb6e93 ANR caused by incorrect cleanup in BroadcastQueue.
Two broadcasts could be sent to the same app simultaneously:
one foreground, one background. For example, LOCALE_CHANGED
and PACKAGE_CHANGED are delievered to com.android.vending
at the same time.
1. AMS started new vending process to handle LOCALE_CHANGED.
   And set app.curReceiver = LOCALE_CHANGED.
2. Before LOCALE_CHANGED is handled by vending process,
   PACKAGE_CHANGED was delievered to vending process too.
   AMS set app.curReceiver = PACKAGE_CHANGED. Bad!
3. Vending process finished handling LOCALE_CHANGED.
   AMS clear app.curReceiver = NULL. Bad!
   And Vending process  killed itself without handling
   PACKAGE_CHANGED.
4. AMS known vending process has died, but didn't know that
   BgBroadcastQueue was still waiting for finish message
   for PACKAGE_CHANGED.
At last, BgBroadcastQueue reported ANR for PACKAGE_CHANGED.

This patch adds protection before clearing app.curReceiver,
only set to NULL if the finishing receiver = app.curReceiver
So handleAppDied would know that PACKAGE_CHANGED was not
finished yet, it will abort the broadcast and continue.

Change-Id: Ic4f31b35e21823d4a3c27712391ecbede213a494
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2014-11-26 13:23:30 -08:00
Jeff Sharkey
d76737a732 am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app""
* commit 'b802cd6767c43a85645279a67bb41320058fdb60':
  APK still has privileged flag after being moved from "/system/priv-app"
2014-11-26 18:59:13 +00:00
Ignacio Solla
59565277d9 am c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK."
* commit 'c67b21fa3ff17a1003dc805bb456c41a98bdf964':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-26 18:59:06 +00:00
Elliott Hughes
8e1bbfe0f1 Mention ProGuard in the JNI documentation.
Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606
2014-11-26 10:51:37 -08:00
Jeff Sharkey
b802cd6767 Merge "APK still has privileged flag after being moved from "/system/priv-app"" 2014-11-26 18:35:11 +00:00
Ignacio Solla
c67b21fa3f Merge "[WebView] Allow the WebView to be compiled against the system SDK." 2014-11-26 18:31:01 +00:00
Conley Owens
6a53bd9ddb am 69d28437: Merge "RRO tests: fix potential NPE"
* commit '69d28437d3416301895639b4c51f9b31842126f5':
  RRO tests: fix potential NPE
2014-11-26 18:02:45 +00:00
Conley Owens
c657b302e5 am ed23786c: Merge "RRO tests: adapt tests to split apks"
* commit 'ed23786cc5b19c66c526a576dd39dba720fa5340':
  RRO tests: adapt tests to split apks
2014-11-26 18:02:38 +00:00
Conley Owens
69d28437d3 Merge "RRO tests: fix potential NPE" 2014-11-26 17:57:09 +00:00
Craig Mautner
1c48e3029b am a7a99981: Merge "Fix Presentation window is removed on stack change"
* commit 'a7a999816fed3e0bdd8e65a9b90f7fad2ca5ae16':
  Fix Presentation window is removed on stack change
2014-11-26 17:57:02 +00:00
Conley Owens
ed23786cc5 Merge "RRO tests: adapt tests to split apks" 2014-11-26 17:56:48 +00:00
Craig Mautner
a7a999816f Merge "Fix Presentation window is removed on stack change" 2014-11-26 17:53:00 +00:00
Craig Mautner
f9819b0119 am 17fc8574: Merge "Sync focus stack frame and layer with focus app."
* commit '17fc8574e55d542744f22e34bf1103bcfbefbc27':
  Sync focus stack frame and layer with focus app.
2014-11-26 17:48:16 +00:00
Craig Mautner
17fc8574e5 Merge "Sync focus stack frame and layer with focus app." 2014-11-26 17:43:30 +00:00
Craig Mautner
77f8112d52 am aed35d6b: Merge "Not include fullscreen opaque window on screenshot"
* commit 'aed35d6b57b4076b9b405c384f6d1f65253ab2b0':
  Not include fullscreen opaque window on screenshot
2014-11-26 17:41:57 +00:00
Craig Mautner
aed35d6b57 Merge "Not include fullscreen opaque window on screenshot" 2014-11-26 17:37:37 +00:00
Craig Mautner
6c3548a961 am e7648472: Merge "Measure absolute value of pointer motion distance"
* commit 'e76484721e5b7bd7c2f11a97f04440434b5a66ee':
  Measure absolute value of pointer motion distance
2014-11-26 17:31:08 +00:00
Craig Mautner
e76484721e Merge "Measure absolute value of pointer motion distance" 2014-11-26 17:26:47 +00:00
Kenny Root
3476a2a0b2 am 564ec716: Merge "Track change to Conscrypt"
* commit '564ec716f4ac2f71d7d4e6eb481075603e183b4f':
  Track change to Conscrypt
2014-11-26 17:13:48 +00:00
Kenny Root
564ec716f4 Merge "Track change to Conscrypt" 2014-11-26 17:09:40 +00:00
Kenny Root
9d2d6b6b4b Track change to Conscrypt
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
2014-11-26 09:08:40 -08:00
Narayan Kamath
edda97c9ff am fdbef408: Merge "Start MountService before performBootDexOpt"
* commit 'fdbef4081d715de59525d58d44881b00f616616f':
  Start MountService before performBootDexOpt
2014-11-26 11:05:46 +00:00
Narayan Kamath
fdbef4081d Merge "Start MountService before performBootDexOpt" 2014-11-26 10:59:29 +00:00
Akira Numata
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
tingna_sung
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
tingna_sung
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
tingna_sung
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
tingna_sung
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
tingna_sung
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
Sangkyu Lee
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
Chris Craik
bf62d3070c am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions"
* commit 'af5bd75b3d65fc710784f59d1c22c164312e2691':
  Enable stencil clipping within clearLayerRegions
2014-11-26 00:02:17 +00:00
Chris Craik
af5bd75b3d Merge "Enable stencil clipping within clearLayerRegions" 2014-11-25 23:56:33 +00:00
Elliott Hughes
f67cc14998 am 2657717f: Merge "We have POSIX clocks."
* commit '2657717f97e0de689aa3d8cae75bb0053607839d':
  We have POSIX clocks.
2014-11-25 23:23:45 +00:00
Elliott Hughes
2657717f97 Merge "We have POSIX clocks." 2014-11-25 23:17:59 +00:00
Elliott Hughes
42c569224a We have POSIX clocks.
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
2014-11-25 15:11:59 -08:00
Ignacio Solla
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
tiger_huang
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
Sangkyu Lee
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
Chih-hung Hsieh
43ea037b4c am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '481c4b641ea7d210396f16478c486cabf51db879':
  Fix class vs. struct mismatch
2014-11-25 00:24:23 +00:00
Chih-hung Hsieh
481c4b641e Merge "Fix class vs. struct mismatch" 2014-11-25 00:20:03 +00:00
Bernhard Rosenkränzer
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
Chih-hung Hsieh
6cc39a475d am 613d2066: Merge "Fix unused variables."
* commit '613d20668a28f9dc970949c9efd2ca7f61bed6f4':
  Fix unused variables.
2014-11-25 00:00:22 +00:00
Chih-hung Hsieh
613d20668a Merge "Fix unused variables." 2014-11-24 23:53:36 +00:00
Bernhard Rosenkränzer
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
Chih-hung Hsieh
73780ac392 am 38cc84de: Merge "Remove unused variable"
* commit '38cc84deceaf7bc9fab898cbcb37523cfba2bb66':
  Remove unused variable
2014-11-24 22:20:34 +00:00