159082 Commits

Author SHA1 Message Date
dcashman
24d02652bf Merge "Prevent EntropyMixer from registering with service manager." 2014-12-01 23:49:26 +00:00
Michael Wright
c859b85cb5 Merge "Added Razer USA, Ltd serval" 2014-12-01 23:47:37 +00:00
John Reck
6afc5cf3d9 Merge "Prevent calling GL functions with an invalid surface" 2014-12-01 21:28:27 +00:00
Craig Mautner
ee7c30e1f9 Merge "Avoid capture all black screenshot bitmap" 2014-12-01 16:38:14 +00:00
Yohann Roussel
6829daa44a Merge "Add tests about annotations and enum." 2014-12-01 09:30:59 +00:00
tingna_sung
e3ca048397 Avoid capture all black screenshot bitmap
Captured screenshot bitmap is all black one if none of windows is
surface shown.

Change-Id: I651b2ade1865926d61f945167d60219535fa8bf8
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-12-01 15:22:43 +08:00
Michael Wright
461eaf79a7 Merge "Add keylayout for Logitech RedHawk Gamepad" 2014-12-01 04:36:25 +00:00
Craig Mautner
c4cf78f4d3 Merge "[ActivityManager] Ensure provider external access count will be released." 2014-12-01 00:20:33 +00:00
Craig Mautner
2559637429 Merge "[ActivityManager] Prevent provider from been created twice." 2014-12-01 00:16:41 +00:00
Craig Mautner
94ac906b10 Merge "Fix pointer index out of range exception" 2014-12-01 00:13:28 +00:00
Craig Mautner
208bd91b24 Merge "[ActivityManager] Avoid system server crash due to package removed" 2014-12-01 00:11:52 +00:00
Craig Mautner
7db48ed036 Merge "Reset killedByAm flag at attachApplicationLocked" 2014-11-30 23:55:13 +00:00
Craig Mautner
728e6c6c17 Merge "Prevent showing immersive confirmation unexpectedly" 2014-11-30 23:54:43 +00:00
Elliott Hughes
2c53d22bcc Merge "Mention ProGuard in the JNI documentation." 2014-11-27 18:01:34 +00:00
Narayan Kamath
10a36fb749 Merge "Stop using ErrorStrings for apache." 2014-11-27 17:53:04 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache.
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
2014-11-27 17:23:41 +00:00
Narayan Kamath
8036d2ec73 Merge "Delete general sounding "CharArrayBuffers" class." 2014-11-27 13:57:27 +00:00
Narayan Kamath
0ea4e7b581 Delete general sounding "CharArrayBuffers" class.
Move the code to the only point of use. Preparatory work for
decoupling apache-http from the frameworks.

Change-Id: Ieee54bb725cbac19d0c7513867635df6fbcf2b49
2014-11-27 13:52:11 +00:00
Narayan Kamath
14e28134c4 Merge "Delete unused class from android.net.http." 2014-11-27 12:58:33 +00:00
Narayan Kamath
3ec2def9a3 Delete unused class from android.net.http.
Foundation for moving a lot of these classes out of the frameworks
and @removing these APIs.

Change-Id: I590cdd2867b923533de189ec956b4dd3f82efa46
2014-11-27 12:52:48 +00:00
riddle_hsu
105add8d1a [ActivityManager] Prevent provider from been created twice.
Root Cause:
If a process which contains provider is starting but not
from accessing provider, e.g. service/activity/receiver,
its providers' will be created during handleBindApplication.
And before the process complete publish provider to
ActivityManagerService, if there is an access call to
process provider before the process completes publishing
providers to ActivityManagerService, then the providers
will be created again.


Solution:
Don't schedule install provider if the provider record
already exist and will be published later.

Change-Id: Ic200ceae042c014c86e7edee0acd013b513af334
2014-11-27 05:16:17 +00:00
tingna_sung
4f65ca0f76 Fix pointer index out of range exception
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-27 08:32:14 +08:00
Mathieu Meisser
ad66d7d2c1 Add keylayout for Logitech RedHawk Gamepad
Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e
2014-11-27 00:46:01 +01:00
Olawale Ogunwale
87c5f36210 Merge "Fix bad exclude region in landscape" 2014-11-26 23:13:59 +00:00
Kazuki Nakayama
609cb91c9c Reset killedByAm flag at attachApplicationLocked
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.

Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
2014-11-26 15:07:33 -08:00
louis_chang
33bae1f496 [ActivityManager] Fix NPE when start activity
Symptom:
NPE occurs in line 1184 (resultStack.sendActivityResultLocked)
because resultStack is null.

Root cause:
When starting activity with FLAG_ACTIVITY_FORWARD_RESULT flag,
the resultRecord could be updated, but the resultStack is not
updated as well. In that case, the resultStack is still be
null. The exception will occurs if the activity is not
granted to launch due to permission denied.

Solution:
Update resultStack when resultRecord updates.

Change-Id: I91634e4f713c2e8dbd1a71f358a8fd9beed83ec7
2014-11-26 14:22:29 -08:00
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
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
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
69d28437d3 Merge "RRO tests: fix potential NPE" 2014-11-26 17:57:09 +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
17fc8574e5 Merge "Sync focus stack frame and layer with focus app." 2014-11-26 17:43:30 +00:00
Craig Mautner
aed35d6b57 Merge "Not include fullscreen opaque window on screenshot" 2014-11-26 17:37:37 +00:00
Craig Mautner
e76484721e Merge "Measure absolute value of pointer motion distance" 2014-11-26 17:26:47 +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
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
Kenji Sugimoto
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
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
af5bd75b3d Merge "Enable stencil clipping within clearLayerRegions" 2014-11-25 23:56:33 +00:00