159222 Commits

Author SHA1 Message Date
Lajos Molnar
38935e6eaf Merge "media: allow full range of Vorbis sampling rates" 2014-12-08 18:02:18 +00:00
Narayan Kamath
bdc6cde725 Merge "Fix PhoneStateListener constructor javadoc." 2014-12-08 13:35:46 +00:00
Karol Wrótniak
69d3e55193 Fix PhoneStateListener constructor javadoc.
Removed sentence in visible javadoc of #PhoneStateListener() which
was useless because it referred to another hidden constructor.

Change-Id: I14a956ac29881000e48bf31e0090e9e1f93bf6e3
2014-12-08 13:13:24 +00:00
Bernhard Rosenkränzer
46c82b4cd2 Adjust format strings to work on both 32-bit and 64-bit builds
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds

Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-05 16:14:07 -08:00
Dmitriy Ivanov
4b58cda367 Remove unsed check for simulator
Change-Id: I46f134d960db330e7b6e7dbfebc84d602d3a3466
2014-12-05 14:08:04 -08:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Lajos Molnar
24ffac0135 MediaCodec/Image: handle null cropRect correctly
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image

Bug: 18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
2014-12-04 16:33:57 -08:00
Lajos Molnar
32d8cc1429 media: fix isSupportedFormat for integer frame rate
Bug: 18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
2014-12-04 16:29:30 -08:00
Lajos Molnar
cea639cf3f media: add support for 160-byte image info in MediaCodec
Some 64-bit compilers now create 160-byte image structures.

Bug: 18513091
Change-Id: I355714affaac0fde0b03578d13ab8f373dd5aa81
2014-12-04 16:28:33 -08:00
Lajos Molnar
0ca248599c media: allow full range of Vorbis sampling rates
Bug: 18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
2014-12-04 16:27:39 -08:00
Amith Yamasani
d234dc1f20 Merge "Correct check of is user running" 2014-12-04 23:09:48 +00:00
Mike Lockwood
448403b7a4 Merge "Dont call close in in BluetoothA2dp finalize" 2014-12-04 21:41:13 +00:00
Alex Klyubin
f162066db5 Remove DefaultHostnameVerifier from preloaded-classes.
libcore's DefaultHostnameVerifier no longer exists. See
https://android-review.googlesource.com/#/c/117453/.

Bug: 18481199
Change-Id: I5c07e058aaaf8531d420058cfd104c4e751757a3
2014-12-04 09:41:46 -08:00
Craig Mautner
e879b2ae69 Merge "Prevent ANR when broadcast receiver is killed" 2014-12-04 01:56:39 +00:00
Kenji Sugimoto
4472fa9780 Prevent ANR when broadcast receiver is killed
If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.

As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.

Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.

Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
2014-12-03 17:53:06 -08:00
Chih-hung Hsieh
ccce6e0f9f Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 2014-12-04 01:04:09 +00:00
Adam Lesinski
a2b5067aee Merge "RRO: prevent duplicate system overlays" 2014-12-03 17:44:18 +00:00
Sergii Skorokhodov
9edcc7be49 Correct check of is user running
Before the ActivityManagerService sends an intent or
starts an activity it checks if target user is in
mStartedUsers array.

When removing a non-owner user process the
UserStartedState instance will still be in mStartedUsers
array with mState STOPPING or SHUTDOWN.

This should be checked before sending an intent or start
an activity.

isUserRunningLocked(...) will interpret mState STOPPING
and SHUTDOWN as a non running user.

Change-Id: I1b51bcdb62bdd0f6dbe05dab4d529d4ad40d0d44
2014-12-03 08:36:26 +01:00
Jason Sams
abdaa32dd7 Merge "Fix bug in passing of context flags and version." 2014-12-02 23:45:17 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
2014-12-02 22:52:37 +00:00
Chris Wren
acd01ff076 Merge "Keep deleteIntent when copying Notification attributes" 2014-12-02 22:31:09 +00:00
Jason Sams
81cd2b18bd Fix bug in passing of context flags and version.
Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7
2014-12-02 12:37:04 -08:00
Alan Viverette
71c5d62d96 Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 2014-12-02 19:21:22 +00:00
Craig Mautner
f6be7d177a Merge "[ActivityManager] Fix race condition in pss collection" 2014-12-02 18:57:36 +00:00
Craig Mautner
f54954f975 Merge "bug fix possible NPE while startProcessLocked()" 2014-12-02 17:57:14 +00:00
Craig Mautner
50f513c569 Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 2014-12-02 17:50:31 +00:00
louis_chang
62cfde1442 [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
2014-12-02 12:57:39 +08:00
louis_chang
3d9c431ca4 [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
2014-12-02 12:38:05 +08:00
younghwan1.kim
8f6fc81500 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
2014-12-02 13:04:40 +09:00
Jesse Hall
1ee377764a Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 2014-12-02 00:35:12 +00:00
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