OSDN Git Service
Chris Wren [Tue, 2 Dec 2014 22:31:06 +0000 (22:31 +0000)]
Merge "Keep deleteIntent when copying Notification attributes"
Alan Viverette [Tue, 2 Dec 2014 19:21:21 +0000 (19:21 +0000)]
Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"
Craig Mautner [Tue, 2 Dec 2014 18:57:34 +0000 (18:57 +0000)]
Merge "[ActivityManager] Fix race condition in pss collection"
Craig Mautner [Tue, 2 Dec 2014 17:57:11 +0000 (17:57 +0000)]
Merge "bug fix possible NPE while startProcessLocked()"
Craig Mautner [Tue, 2 Dec 2014 17:50:30 +0000 (17:50 +0000)]
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"
louis_chang [Tue, 2 Dec 2014 04:57:39 +0000 (12:57 +0800)]
[ActivityManager] Fix race condition in pss collection
Symptom:
There has a race condition that two threads are accessing
the mPendingPssProcesses simultaneously. One of the thread
is collecting the process pss by looping the mPendingPssProcesses.
The other thread is requesting to collect pss of all processes,
which clears mPendingPssProcesses and adding processes back.
Solution:
Avoid race condition by adding synchornized protection.
Change-Id: Ifb090eda9c4a1b8e3fd980fe0171e9dd77773b46
louis_chang [Tue, 2 Dec 2014 04:38:05 +0000 (12:38 +0800)]
[ActivityManager] Invalidate last screenshot when activity relaunched
Symptom:
The task thumbnail is not updated when activity relaunched.
Reproduce Steps:
1. Put device in portrait
2. Launch Calculator
3. Launch Recent App (the Calculator's screenshot is correct)
4. Rotate device to landscape
5. Click Calculator in Recent App to return to Calculator (Calculator has relaunched to landsacpe ui)
6. Launch Recent App again (the Calculator's screenshot is not updated)
Change-Id: I92e951ea2ee215c52ca6e50cf6f9e02deb787bce
younghwan1.kim [Tue, 2 Dec 2014 04:04:40 +0000 (13:04 +0900)]
bug fix possible NPE while startProcessLocked()
In case, process doesn't create well while startingProcessLocked().
There is possibility to make NPE.
Setting app's crash handler needs to be assigned after null check routine.
Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31
Jesse Hall [Tue, 2 Dec 2014 00:35:11 +0000 (00:35 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
dcashman [Mon, 1 Dec 2014 23:49:25 +0000 (23:49 +0000)]
Merge "Prevent EntropyMixer from registering with service manager."
Michael Wright [Mon, 1 Dec 2014 23:47:37 +0000 (23:47 +0000)]
Merge "Added Razer USA, Ltd serval"
John Reck [Mon, 1 Dec 2014 21:28:26 +0000 (21:28 +0000)]
Merge "Prevent calling GL functions with an invalid surface"
Craig Mautner [Mon, 1 Dec 2014 16:38:14 +0000 (16:38 +0000)]
Merge "Avoid capture all black screenshot bitmap"
Yohann Roussel [Mon, 1 Dec 2014 09:30:59 +0000 (09:30 +0000)]
Merge "Add tests about annotations and enum."
tingna_sung [Tue, 21 Oct 2014 05:22:16 +0000 (13:22 +0800)]
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>
Michael Wright [Mon, 1 Dec 2014 04:36:23 +0000 (04:36 +0000)]
Merge "Add keylayout for Logitech RedHawk Gamepad"
Craig Mautner [Mon, 1 Dec 2014 00:20:33 +0000 (00:20 +0000)]
Merge "[ActivityManager] Ensure provider external access count will be released."
Craig Mautner [Mon, 1 Dec 2014 00:16:38 +0000 (00:16 +0000)]
Merge "[ActivityManager] Prevent provider from been created twice."
Craig Mautner [Mon, 1 Dec 2014 00:13:27 +0000 (00:13 +0000)]
Merge "Fix pointer index out of range exception"
Craig Mautner [Mon, 1 Dec 2014 00:11:51 +0000 (00:11 +0000)]
Merge "[ActivityManager] Avoid system server crash due to package removed"
Craig Mautner [Sun, 30 Nov 2014 23:55:12 +0000 (23:55 +0000)]
Merge "Reset killedByAm flag at attachApplicationLocked"
Craig Mautner [Sun, 30 Nov 2014 23:54:42 +0000 (23:54 +0000)]
Merge "Prevent showing immersive confirmation unexpectedly"
Elliott Hughes [Thu, 27 Nov 2014 18:01:33 +0000 (18:01 +0000)]
Merge "Mention ProGuard in the JNI documentation."
Narayan Kamath [Thu, 27 Nov 2014 17:53:04 +0000 (17:53 +0000)]
Merge "Stop using ErrorStrings for apache."
Narayan Kamath [Thu, 27 Nov 2014 17:20:21 +0000 (17:20 +0000)]
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
Narayan Kamath [Thu, 27 Nov 2014 13:57:27 +0000 (13:57 +0000)]
Merge "Delete general sounding "CharArrayBuffers" class."
Narayan Kamath [Thu, 27 Nov 2014 12:58:52 +0000 (12:58 +0000)]
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
Narayan Kamath [Thu, 27 Nov 2014 12:58:32 +0000 (12:58 +0000)]
Merge "Delete unused class from android.net.http."
Narayan Kamath [Thu, 27 Nov 2014 12:52:48 +0000 (12:52 +0000)]
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
riddle_hsu [Sat, 15 Nov 2014 10:25:34 +0000 (18:25 +0800)]
[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
tingna_sung [Sat, 25 Oct 2014 13:52:47 +0000 (21:52 +0800)]
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>
Mathieu Meisser [Wed, 26 Nov 2014 23:44:42 +0000 (00:44 +0100)]
Add keylayout for Logitech RedHawk Gamepad
Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e
Olawale Ogunwale [Wed, 26 Nov 2014 23:13:59 +0000 (23:13 +0000)]
Merge "Fix bad exclude region in landscape"
Kazuki Nakayama [Thu, 29 May 2014 07:05:34 +0000 (16:05 +0900)]
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
dcashman [Tue, 25 Nov 2014 20:59:12 +0000 (12:59 -0800)]
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
Craig Mautner [Wed, 26 Nov 2014 21:43:59 +0000 (21:43 +0000)]
Merge "ANR caused by incorrect cleanup in BroadcastQueue."
Guobin Zhang [Fri, 7 Mar 2014 09:47:10 +0000 (17:47 +0800)]
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>
Elliott Hughes [Tue, 25 Nov 2014 19:18:43 +0000 (11:18 -0800)]
Mention ProGuard in the JNI documentation.
Change-Id: I7822ec1eca0290eba1f4b08eca6794b41172d606
Jeff Sharkey [Wed, 26 Nov 2014 18:35:10 +0000 (18:35 +0000)]
Merge "APK still has privileged flag after being moved from "/system/priv-app""
Ignacio Solla [Wed, 26 Nov 2014 18:31:00 +0000 (18:31 +0000)]
Merge "[WebView] Allow the WebView to be compiled against the system SDK."
Conley Owens [Wed, 26 Nov 2014 17:57:08 +0000 (17:57 +0000)]
Merge "RRO tests: fix potential NPE"
Conley Owens [Wed, 26 Nov 2014 17:56:47 +0000 (17:56 +0000)]
Merge "RRO tests: adapt tests to split apks"
Craig Mautner [Wed, 26 Nov 2014 17:52:59 +0000 (17:52 +0000)]
Merge "Fix Presentation window is removed on stack change"
Craig Mautner [Wed, 26 Nov 2014 17:43:29 +0000 (17:43 +0000)]
Merge "Sync focus stack frame and layer with focus app."
Craig Mautner [Wed, 26 Nov 2014 17:37:37 +0000 (17:37 +0000)]
Merge "Not include fullscreen opaque window on screenshot"
Craig Mautner [Wed, 26 Nov 2014 17:26:45 +0000 (17:26 +0000)]
Merge "Measure absolute value of pointer motion distance"
Kenny Root [Wed, 26 Nov 2014 17:09:40 +0000 (17:09 +0000)]
Merge "Track change to Conscrypt"
Kenny Root [Wed, 26 Nov 2014 17:08:40 +0000 (09:08 -0800)]
Track change to Conscrypt
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
Narayan Kamath [Wed, 26 Nov 2014 10:59:28 +0000 (10:59 +0000)]
Merge "Start MountService before performBootDexOpt"
Akira Numata [Tue, 25 Nov 2014 08:50:12 +0000 (17:50 +0900)]
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
tingna_sung [Tue, 14 Oct 2014 10:05:34 +0000 (18:05 +0800)]
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>
tingna_sung [Sat, 25 Oct 2014 16:46:12 +0000 (00:46 +0800)]
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>
tingna_sung [Tue, 21 Oct 2014 07:26:38 +0000 (15:26 +0800)]
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>
tingna_sung [Tue, 21 Oct 2014 09:09:57 +0000 (17:09 +0800)]
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>
tingna_sung [Tue, 21 Oct 2014 08:03:06 +0000 (16:03 +0800)]
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>
Sangkyu Lee [Fri, 21 Nov 2014 09:05:41 +0000 (18:05 +0900)]
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
Chris Craik [Tue, 25 Nov 2014 23:56:32 +0000 (23:56 +0000)]
Merge "Enable stencil clipping within clearLayerRegions"
Elliott Hughes [Tue, 25 Nov 2014 23:17:59 +0000 (23:17 +0000)]
Merge "We have POSIX clocks."
Elliott Hughes [Tue, 25 Nov 2014 23:11:59 +0000 (15:11 -0800)]
We have POSIX clocks.
Change-Id: I70f82074f8c14a26c4ed7eb912ddf6d7da44c168
Ignacio Solla [Mon, 10 Nov 2014 10:35:54 +0000 (10:35 +0000)]
[WebView] Allow the WebView to be compiled against the system SDK.
BUG:
18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
tiger_huang [Tue, 14 Oct 2014 06:48:00 +0000 (14:48 +0800)]
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
Sangkyu Lee [Fri, 7 Nov 2014 09:54:59 +0000 (18:54 +0900)]
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
chh [Tue, 25 Nov 2014 00:37:12 +0000 (00:37 +0000)]
Merge "Remove unused variables and functions, don't warn about unused parameters"
Chih-hung Hsieh [Tue, 25 Nov 2014 00:20:02 +0000 (00:20 +0000)]
Merge "Fix class vs. struct mismatch"
Bernhard Rosenkränzer [Mon, 17 Nov 2014 20:15:30 +0000 (21:15 +0100)]
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>
Chih-hung Hsieh [Mon, 24 Nov 2014 23:53:35 +0000 (23:53 +0000)]
Merge "Fix unused variables."
Bernhard Rosenkränzer [Wed, 12 Nov 2014 13:45:58 +0000 (14:45 +0100)]
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>
Chih-hung Hsieh [Mon, 24 Nov 2014 22:15:41 +0000 (22:15 +0000)]
Merge "Remove unused variable"
Chih-Hung Hsieh [Mon, 24 Nov 2014 20:15:12 +0000 (20:15 +0000)]
Merge "Remove unused function"
Chih-Hung Hsieh [Mon, 24 Nov 2014 19:52:43 +0000 (11:52 -0800)]
Remove unused function
Remove an unused static function clang complains about
Change-Id: Id5875960e9f93348c7a3a912f42b5f457af2cdc0
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Narayan Kamath [Mon, 24 Nov 2014 16:14:32 +0000 (16:14 +0000)]
Merge "Stop using DATE_FORMAT from settings."
Narayan Kamath [Mon, 24 Nov 2014 16:10:01 +0000 (16:10 +0000)]
Merge "Stop reading Settings.System.DATE_FORMAT."
Narayan Kamath [Tue, 18 Nov 2014 13:23:02 +0000 (13:23 +0000)]
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
Dohyun Lee [Mon, 24 Nov 2014 12:08:15 +0000 (21:08 +0900)]
Enable stencil clipping within clearLayerRegions
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c2402777d5e53b4590af5f32f8c55afd81. 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>
Bernhard Rosenkränzer [Sun, 23 Nov 2014 21:24:32 +0000 (22:24 +0100)]
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>
Elliott Hughes [Sat, 22 Nov 2014 07:47:27 +0000 (07:47 +0000)]
Merge "We HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 07:36:45 +0000 (23:36 -0800)]
We HAVE_LITTLE_ENDIAN.
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
Olawale Ogunwale [Sat, 22 Nov 2014 02:12:48 +0000 (02:12 +0000)]
Merge "Add window to child window list with correct order"
Chih-hung Hsieh [Sat, 22 Nov 2014 00:24:38 +0000 (00:24 +0000)]
Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""
John Reck [Sat, 22 Nov 2014 00:10:45 +0000 (00:10 +0000)]
Merge "Revert "Frameworks/base: Unused parameters in hwui""
John Reck [Sat, 22 Nov 2014 00:10:02 +0000 (00:10 +0000)]
Revert "Frameworks/base: Unused parameters in hwui"
This reverts commit
42ddc18d108f789705ad4eb697ce9599ad322507.
Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d
Andreas Gampe [Fri, 21 Nov 2014 21:34:45 +0000 (21:34 +0000)]
Merge "Frameworks/base: Unused parameters in hwui"
Alan Viverette [Fri, 21 Nov 2014 20:40:28 +0000 (20:40 +0000)]
Merge "Fix error overwriting when restoring error"
Alan Viverette [Fri, 21 Nov 2014 20:40:08 +0000 (20:40 +0000)]
Merge "Use parseColor instead of getHTMLColor"
Chih-hung Hsieh [Fri, 21 Nov 2014 18:54:15 +0000 (18:54 +0000)]
Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
Should be unnecessary after c/115476.
This reverts commit
ba823cee8bafff98640408a777fe105a72fcea0d.
Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
Andreas Gampe [Fri, 21 Nov 2014 17:49:08 +0000 (09:49 -0800)]
Frameworks/base: Unused parameters in hwui
Remove Clang cutout for unused parameters. Fix warnings.
Remove Clang cutout for deprecated Skia function usage. Has been
fixed in the L push.
Change-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7
Andreas Gampe [Fri, 21 Nov 2014 18:18:35 +0000 (18:18 +0000)]
Merge "Frameworks/base: Consistency in core/jni"
Andreas Gampe [Fri, 21 Nov 2014 06:02:20 +0000 (22:02 -0800)]
Frameworks/base: Consistency in core/jni
Make consistent use of core_jni_helpers for registration.
Translate some #ifdefs into const bools.
Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
Andreas Gampe [Fri, 21 Nov 2014 17:39:32 +0000 (17:39 +0000)]
Merge "Frameworks/base: Wall Werror in media/tests"
Andreas Gampe [Fri, 21 Nov 2014 17:38:06 +0000 (17:38 +0000)]
Merge "Frameworks/base: Remove unused header"
Andreas Gampe [Fri, 21 Nov 2014 00:11:57 +0000 (16:11 -0800)]
Frameworks/base: Remove unused header
android_nfc.h is used nowhere.
Change-Id: I3009b3eb122674d3fe7ddb201bac18368b78bc02
Chih-hung Hsieh [Thu, 20 Nov 2014 23:50:04 +0000 (23:50 +0000)]
Merge "Fix format strings mismatching the parameters passed to them"
Bernhard Rosenkränzer [Mon, 17 Nov 2014 19:25:28 +0000 (20:25 +0100)]
Fix format strings mismatching the parameters passed to them
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Dan Albert [Thu, 20 Nov 2014 22:58:46 +0000 (22:58 +0000)]
Merge "Fix clang warnings in core/jni."
Dan Albert [Thu, 20 Nov 2014 22:19:38 +0000 (22:19 +0000)]
Merge "Add appropriate casts for char16_t."
Dan Albert [Thu, 20 Nov 2014 19:41:21 +0000 (11:41 -0800)]
Add appropriate casts for char16_t.
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.
Bug:
18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
Dan Albert [Wed, 19 Nov 2014 00:07:51 +0000 (16:07 -0800)]
Fix clang warnings in core/jni.
There are a few bugs in here too (mostly people expecting + to
concatenate C strings) :(
Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
Yohann Roussel [Mon, 17 Nov 2014 11:33:01 +0000 (12:33 +0100)]
Add tests about annotations and enum.
For reproduction of https://code.google.com/p/android/issues/detail?id=78144
Bug:
18385117
Change-Id: I23be53a0ae481a501d13adc8abf518ac664a772f
Narayan Kamath [Thu, 20 Nov 2014 10:47:16 +0000 (10:47 +0000)]
Merge "Tell installd when boot completes."
tiger_huang [Thu, 13 Nov 2014 11:46:28 +0000 (19:46 +0800)]
Add window to child window list with correct order
The original logic of comparing with mBaseLayer of two child windows
of the same parent was wrong, because the mBaseLayer is always the
same.
After adding two child windows with the same positive sublayer, the
one added later should have greater z-order. The order should be
consistent with WindowManagerService.addAttachedWindowToListLocked()
Change-Id: I789179aee61d141fad86bd24262fabfb1e517e66