OSDN Git Service

android-x86/frameworks-base.git
9 years agoCore/jni: Disallow relocation for decryption
neo.chae [Wed, 7 Jan 2015 06:32:15 +0000 (15:32 +0900)]
Core/jni: Disallow relocation for decryption

When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.

If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.

This patch ensures that the boot image is not being relocated.

Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
9 years agoMerge "Race-condition in SoundPool during release"
Narayan Kamath [Mon, 5 Jan 2015 17:57:25 +0000 (17:57 +0000)]
Merge "Race-condition in SoundPool during release"

9 years agoMerge "fix issuse 65774"
Narayan Kamath [Fri, 2 Jan 2015 10:22:20 +0000 (10:22 +0000)]
Merge "fix issuse 65774"

9 years agofix issuse 65774
Paul Quei [Wed, 19 Mar 2014 07:18:54 +0000 (15:18 +0800)]
fix issuse 65774

"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."

Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
9 years agoMerge "Remove hardcoded include paths."
Narayan Kamath [Wed, 31 Dec 2014 10:08:47 +0000 (10:08 +0000)]
Merge "Remove hardcoded include paths."

9 years agoRemove hardcoded include paths.
Narayan Kamath [Tue, 30 Dec 2014 11:53:25 +0000 (11:53 +0000)]
Remove hardcoded include paths.

ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18

9 years agoMerge "Missing break in switch statement"
Narayan Kamath [Tue, 30 Dec 2014 09:43:00 +0000 (09:43 +0000)]
Merge "Missing break in switch statement"

9 years agoMerge "Throw IllegalArgumentException on invalid hex-strings."
Narayan Kamath [Mon, 29 Dec 2014 16:08:32 +0000 (16:08 +0000)]
Merge "Throw IllegalArgumentException on invalid hex-strings."

9 years agoMerge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
Narayan Kamath [Mon, 29 Dec 2014 12:08:56 +0000 (12:08 +0000)]
Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."

9 years agoMerge "Fix "pm list permissions" crash if resource string missing"
Narayan Kamath [Mon, 29 Dec 2014 11:01:27 +0000 (11:01 +0000)]
Merge "Fix "pm list permissions" crash if resource string missing"

9 years agoMerge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
Narayan Kamath [Mon, 29 Dec 2014 10:02:26 +0000 (10:02 +0000)]
Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

9 years agoMerge "[ActivityManager] Reset ActivityRecord's waitingVisible"
Craig Mautner [Mon, 29 Dec 2014 01:30:49 +0000 (01:30 +0000)]
Merge "[ActivityManager] Reset ActivityRecord's waitingVisible"

9 years agoMerge "telephony: Update comments for preferred network mode"
Elliott Hughes [Fri, 26 Dec 2014 18:48:56 +0000 (18:48 +0000)]
Merge "telephony: Update comments for preferred network mode"

9 years agotelephony: Update comments for preferred network mode
Sungmin Choi [Mon, 9 Jun 2014 05:45:51 +0000 (14:45 +0900)]
telephony: Update comments for preferred network mode

Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d

9 years agoMerge "Mods to the SELinuxMMAC engine code."
Nick Kralevich [Tue, 23 Dec 2014 19:42:05 +0000 (19:42 +0000)]
Merge "Mods to the SELinuxMMAC engine code."

9 years agoMods to the SELinuxMMAC engine code.
Robert Craig [Wed, 19 Nov 2014 18:56:10 +0000 (13:56 -0500)]
Mods to the SELinuxMMAC engine code.

* We now require that all certs used to sign the apk and all
  certs stored with policy be tested for set equality. Prior
  efforts required that the cert included with policy only
  needed to match one of the certs included with an apk.

* Allowed a new tag to be included with policy describing the
  signatures. <cert signature=""/> is now allowed as a child
  element of the <signer> tag describing multiple certs. The
  old way of describing signatures attached as attributes to
  the root signer tag is still supported. The engine now treats
  it the same as if they used the new layout with the outer
  signature as the first signature value.

* Moved the class which holds all policy from an inner static
  to a builder pattern governed by the Policy.PolicyBuilder
  class. This will help provide more clarity and allow for
  easier enforcement of certain invariants as the policy
  representation is being built.

* Loads of new comments.

Change-Id: I38eb00ed8962fdef71bc9f2e7370cb910cadeff4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
9 years agoMerge "Build against libphonenumber-platform."
Narayan Kamath [Tue, 23 Dec 2014 13:33:44 +0000 (13:33 +0000)]
Merge "Build against libphonenumber-platform."

9 years agoMerge "Core/jni: Remove Dalvik options from AndroidRuntime"
Andreas Gampe [Tue, 23 Dec 2014 03:29:45 +0000 (03:29 +0000)]
Merge "Core/jni: Remove Dalvik options from AndroidRuntime"

9 years agoCore/jni: Remove Dalvik options from AndroidRuntime
Andreas Gampe [Thu, 18 Dec 2014 22:39:22 +0000 (14:39 -0800)]
Core/jni: Remove Dalvik options from AndroidRuntime

Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f

9 years agoMerge "Layout the config-changed window if it has surface"
Olawale Ogunwale [Fri, 19 Dec 2014 15:30:38 +0000 (15:30 +0000)]
Merge "Layout the config-changed window if it has surface"

9 years ago[ActivityManager] Reset ActivityRecord's waitingVisible
louis_chang [Fri, 19 Dec 2014 09:30:45 +0000 (17:30 +0800)]
[ActivityManager] Reset ActivityRecord's waitingVisible

Symptom:
The ActivityRecord's waitingVisible is not set to false for
all cases when the ActivityRecord is removed from
mStackSupervisor.mWaitingVisibleActivities.

Solution:
Set the waitingVisible to false when it is removed from
mStackSupervisor.mWaitingVisibleActivities

Change-Id: If0f0683971d70a6866b0167e91dd95feebaac178

9 years agoMerge "Fix racing condition of mTouchExcludeRegion"
Craig Mautner [Fri, 19 Dec 2014 06:41:26 +0000 (06:41 +0000)]
Merge "Fix racing condition of mTouchExcludeRegion"

9 years agoFix racing condition of mTouchExcludeRegion
tingna_sung [Sat, 25 Oct 2014 13:32:40 +0000 (21:32 +0800)]
Fix racing condition of mTouchExcludeRegion

Copy region from DisplayContent.mTouchExcludeRegion instead of
directly refer to the same object of DisplayContent, and able to
protect it by lock of self class, don't have to lock out mWindowMap
on every tap.

This fix is to avoid racing condition of mTouchExcludeRegion.

Change-Id: I7401968167c2e539b4da2afe71e3020038fbfcbf
Signed-off-by: tingna_sung <tingna_sung@htc.com>
9 years agoLayout the config-changed window if it has surface
tiger_huang [Wed, 10 Dec 2014 08:26:17 +0000 (16:26 +0800)]
Layout the config-changed window if it has surface

This patch fixes an issue which caused the resumed app to get the
wrong frame at first.

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

Change-Id: I4483029326afca143e7921f3b9563da4f566d2e5

9 years agoMerge "Add mips64 support to app_process."
Jeff Hao [Thu, 18 Dec 2014 19:18:53 +0000 (19:18 +0000)]
Merge "Add mips64 support to app_process."

9 years agoMerge "Remove DefaultHostnameVerifier from preloaded-classes."
Alex Klyubin [Thu, 18 Dec 2014 17:40:45 +0000 (17:40 +0000)]
Merge "Remove DefaultHostnameVerifier from preloaded-classes."

9 years agoMerge "Avoid deadlock between ActivityManagerService and ProcessStatsService."
Olawale Ogunwale [Thu, 18 Dec 2014 16:55:42 +0000 (16:55 +0000)]
Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService."

9 years agoMerge "Move the remaining ZygoteInit native code over to Java."
Elliott Hughes [Thu, 18 Dec 2014 16:55:23 +0000 (16:55 +0000)]
Merge "Move the remaining ZygoteInit native code over to Java."

9 years agoBuild against libphonenumber-platform.
Narayan Kamath [Thu, 18 Dec 2014 13:26:03 +0000 (13:26 +0000)]
Build against libphonenumber-platform.

Don't compile libphonenumber sources directly.

Change-Id: Ib2efd84535a2cffe773271fd1ddcb66a6a651cb8

9 years agoAdd mips64 support to app_process.
Douglas Leung [Thu, 18 Dec 2014 04:25:20 +0000 (20:25 -0800)]
Add mips64 support to app_process.

Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214

9 years agoMerge "Remove a bitrotted test."
Elliott Hughes [Thu, 18 Dec 2014 00:32:00 +0000 (00:32 +0000)]
Merge "Remove a bitrotted test."

9 years agoRemove a bitrotted test.
Elliott Hughes [Thu, 18 Dec 2014 00:17:19 +0000 (16:17 -0800)]
Remove a bitrotted test.

Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b

9 years agoMerge "Prevent wrong system ui visibility callback after the user swipe"
Olawale Ogunwale [Wed, 17 Dec 2014 21:43:25 +0000 (21:43 +0000)]
Merge "Prevent wrong system ui visibility callback after the user swipe"

9 years agoMerge "[ActivityManager] Use synchronized to protect object"
Olawale Ogunwale [Wed, 17 Dec 2014 21:42:43 +0000 (21:42 +0000)]
Merge "[ActivityManager] Use synchronized to protect object"

9 years agoMove the remaining ZygoteInit native code over to Java.
Elliott Hughes [Wed, 17 Dec 2014 20:28:29 +0000 (12:28 -0800)]
Move the remaining ZygoteInit native code over to Java.

Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4

9 years agoMerge "Rewrite selectReadable JNI in Java."
Elliott Hughes [Wed, 17 Dec 2014 18:21:06 +0000 (18:21 +0000)]
Merge "Rewrite selectReadable JNI in Java."

9 years agoThrow IllegalArgumentException on invalid hex-strings.
Narayan Kamath [Wed, 17 Dec 2014 13:40:36 +0000 (13:40 +0000)]
Throw IllegalArgumentException on invalid hex-strings.

Beats returning null since there's let's chance it will be interpreted
as the lack of a password.

Change-Id: I4986a8e806d9066129f696ab9f2e80655424e723

9 years agoMerge "Move frameworks users over to libcore hex encoding API."
Narayan Kamath [Wed, 17 Dec 2014 13:33:59 +0000 (13:33 +0000)]
Merge "Move frameworks users over to libcore hex encoding API."

9 years agoMerge "Fix typo with register native allocation."
Tim Murray [Tue, 16 Dec 2014 21:30:57 +0000 (21:30 +0000)]
Merge "Fix typo with register native allocation."

9 years agoMerge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:46:17 +0000 (20:46 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

9 years agoCleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:43:40 +0000 (12:43 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.

Bug: 18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc

9 years agoRewrite selectReadable JNI in Java.
Elliott Hughes [Mon, 15 Dec 2014 20:39:51 +0000 (12:39 -0800)]
Rewrite selectReadable JNI in Java.

Bug: 18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438

9 years agoFix typo with register native allocation.
Tim Murray [Tue, 16 Dec 2014 17:59:09 +0000 (09:59 -0800)]
Fix typo with register native allocation.

bug 18579193

Change-Id: I42d30709b79a37d6a4126559a511e98e9c8d4808

9 years agoMove frameworks users over to libcore hex encoding API.
Narayan Kamath [Tue, 16 Dec 2014 12:56:23 +0000 (12:56 +0000)]
Move frameworks users over to libcore hex encoding API.

Removes dependency on apache-http.

bug: 18027885
Change-Id: I508db016747985ecdd68e02d5d4efcd0ddd694df

9 years ago[ActivityManager] Use synchronized to protect object
mark_chen [Fri, 12 Dec 2014 07:38:48 +0000 (15:38 +0800)]
[ActivityManager] Use synchronized to protect object

Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object

Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da

9 years agoMerge "Turn debug flag off"
Christopher Tate [Tue, 16 Dec 2014 02:53:13 +0000 (02:53 +0000)]
Merge "Turn debug flag off"

9 years agoMerge "Reimplement reopenStdio in Java."
Elliott Hughes [Mon, 15 Dec 2014 19:24:52 +0000 (19:24 +0000)]
Merge "Reimplement reopenStdio in Java."

9 years agoReimplement reopenStdio in Java.
Elliott Hughes [Mon, 15 Dec 2014 19:00:25 +0000 (11:00 -0800)]
Reimplement reopenStdio in Java.

Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3

9 years agoTurn debug flag off
Alan Jeon [Sat, 13 Dec 2014 13:44:53 +0000 (22:44 +0900)]
Turn debug flag off

Change-Id: Iced1a24ecfc182eccedd3a749fab9dd32dea41da
Signed-off-by: Alan Jeon <skyisle@gmail.com>
9 years agoMerge "Enable native tracking for RS contexts to improve GC behavior."
Tim Murray [Sat, 13 Dec 2014 00:02:30 +0000 (00:02 +0000)]
Merge "Enable native tracking for RS contexts to improve GC behavior."

9 years agoMerge "Lose some unnecessary JNI from the zygote."
Elliott Hughes [Fri, 12 Dec 2014 23:18:48 +0000 (23:18 +0000)]
Merge "Lose some unnecessary JNI from the zygote."

9 years agoMerge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
Christopher Tate [Fri, 12 Dec 2014 22:11:15 +0000 (22:11 +0000)]
Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"

9 years agoLose some unnecessary JNI from the zygote.
Elliott Hughes [Fri, 12 Dec 2014 22:07:34 +0000 (14:07 -0800)]
Lose some unnecessary JNI from the zygote.

Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267

9 years agoEnable native tracking for RS contexts to improve GC behavior.
Tim Murray [Fri, 12 Dec 2014 19:34:48 +0000 (11:34 -0800)]
Enable native tracking for RS contexts to improve GC behavior.

This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2

9 years agoMerge "[ActivityManager] Fix NPE when start activity"
Olawale Ogunwale [Fri, 12 Dec 2014 13:49:50 +0000 (13:49 +0000)]
Merge "[ActivityManager] Fix NPE when start activity"

9 years agoFix bugs regarding delay the dispatching of non-wakeup alarms
minho.choo [Fri, 12 Dec 2014 07:13:55 +0000 (16:13 +0900)]
Fix bugs regarding delay the dispatching of non-wakeup alarms

checkAllowNonWakeupDelayLocked() method determines that delay the dispatching of non-wakeup alarms.
(there are no wakeup alarms and the screen is off, it can delay until the future.)

if there is any pending non-wakeup alarms, non-wakeup alarm delivery time is bigger than nowELAPSED.
but, checkAllowNonWakeupDelayLocked() returns false and non-wakeup alarm is not delay until future.

i think it is necessary to reverse the inequality symbol on "mNextNonWakeupDeliveryTime > nowELAPSED"
if it isn't, Could you let me know when we get ¡°stuck in a loop¡± in the comment of checkAllowNonWakeupDelayLocked () method?

Change-Id: I7e972064547f4d0a9b4175dbd4cf735b4837abfd
Signed-off-by: Minho Choo <minho.choo@lge.com>
9 years agoMerge "Adjust format strings to work on both 32-bit and 64-bit builds"
Chih-hung Hsieh [Thu, 11 Dec 2014 20:49:29 +0000 (20:49 +0000)]
Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

9 years agoMerge "Avoid tearing down process groups twice."
Narayan Kamath [Thu, 11 Dec 2014 09:15:05 +0000 (09:15 +0000)]
Merge "Avoid tearing down process groups twice."

9 years agoMerge "Remove some crufty "core" tests."
Narayan Kamath [Thu, 11 Dec 2014 09:14:15 +0000 (09:14 +0000)]
Merge "Remove some crufty "core" tests."

9 years agoRemove some crufty "core" tests.
Narayan Kamath [Wed, 10 Dec 2014 19:49:59 +0000 (19:49 +0000)]
Remove some crufty "core" tests.

nobody runs these, and these things are well tested elsewhere
and a part of CTS.

Change-Id: I1ec00f2a085fc82f902f538ace692ac989ca03df

9 years agoMerge "Only one task within the stack should moveToBack"
Craig Mautner [Wed, 10 Dec 2014 17:51:31 +0000 (17:51 +0000)]
Merge "Only one task within the stack should moveToBack"

9 years agoAvoid tearing down process groups twice.
Narayan Kamath [Wed, 10 Dec 2014 10:00:14 +0000 (10:00 +0000)]
Avoid tearing down process groups twice.

The second removal always triggers a warning.

Change-Id: Ieafa8374dbffdaff0d576de004a688cae6f8ac18

9 years agoMerge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."
Craig Mautner [Tue, 9 Dec 2014 16:33:25 +0000 (16:33 +0000)]
Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."

9 years agoMerge "Fix typo."
Elliott Hughes [Tue, 9 Dec 2014 16:02:56 +0000 (16:02 +0000)]
Merge "Fix typo."

9 years ago[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
Mark Lu [Tue, 9 Dec 2014 06:47:13 +0000 (14:47 +0800)]
[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.

Symptom:
in .ActivityStack.resetTargetTaskIfNeededLocked,  "allowTaskReparenting" if case will call setTask
to remove activities from task, that will caused numActivities in main for-loop not consist with task.mActivities size.
caused NPE will happend in finish activities for-loop due to get null object from activities when clearWhenTaskReset" as true case.

Root Cause:
when clearWhenTaskReset as true, will set "end" variable as numActivities -1, but if calling setTask to remove activities from task,
end value will out of date & not same with task.mActivities size.

Solution:
use activities.size() - 1 to assign end value.

Change-Id: I5d7fe22e1df2fc61738db23402e7c42cf6d8c4cc

9 years agoFix typo.
Elliott Hughes [Tue, 9 Dec 2014 04:47:11 +0000 (20:47 -0800)]
Fix typo.

Bug: https://code.google.com/p/android/issues/detail?id=78422
Change-Id: I0dfbb74334e126062660831a4e01817dde068b56

9 years agoMerge "Add more -d dalvik details to dumpsys"
Mathieu Chartier [Tue, 9 Dec 2014 02:05:44 +0000 (02:05 +0000)]
Merge "Add more -d dalvik details to dumpsys"

9 years agoAdd more -d dalvik details to dumpsys
Mathieu Chartier [Tue, 9 Dec 2014 00:20:26 +0000 (16:20 -0800)]
Add more -d dalvik details to dumpsys

Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)

9 years agoMerge "Remove unsed check for simulator"
Dmitriy Ivanov [Mon, 8 Dec 2014 21:17:59 +0000 (21:17 +0000)]
Merge "Remove unsed check for simulator"

9 years agoMerge "media: fix isSupportedFormat for integer frame rate"
Lajos Molnar [Mon, 8 Dec 2014 18:02:40 +0000 (18:02 +0000)]
Merge "media: fix isSupportedFormat for integer frame rate"

9 years agoMerge "media: allow full range of Vorbis sampling rates"
Lajos Molnar [Mon, 8 Dec 2014 18:02:17 +0000 (18:02 +0000)]
Merge "media: allow full range of Vorbis sampling rates"

9 years agoMerge "Fix PhoneStateListener constructor javadoc."
Narayan Kamath [Mon, 8 Dec 2014 13:35:45 +0000 (13:35 +0000)]
Merge "Fix PhoneStateListener constructor javadoc."

9 years agoFix PhoneStateListener constructor javadoc.
Karol Wrótniak [Thu, 27 Nov 2014 20:29:15 +0000 (21:29 +0100)]
Fix PhoneStateListener constructor javadoc.

Removed sentence in visible javadoc of #PhoneStateListener() which
was useless because it referred to another hidden constructor.

Change-Id: I14a956ac29881000e48bf31e0090e9e1f93bf6e3

9 years agoAdjust format strings to work on both 32-bit and 64-bit builds
Bernhard Rosenkränzer [Sun, 30 Nov 2014 10:04:10 +0000 (11:04 +0100)]
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>
9 years agoRemove unsed check for simulator
Dmitriy Ivanov [Fri, 5 Dec 2014 22:08:04 +0000 (14:08 -0800)]
Remove unsed check for simulator

Change-Id: I46f134d960db330e7b6e7dbfebc84d602d3a3466

9 years agoMerge "Fix NullPointerException in ListView"
Adam Powell [Fri, 5 Dec 2014 19:26:16 +0000 (19:26 +0000)]
Merge "Fix NullPointerException in ListView"

9 years agomedia: fix isSupportedFormat for integer frame rate
Lajos Molnar [Fri, 21 Nov 2014 00:16:55 +0000 (16:16 -0800)]
media: fix isSupportedFormat for integer frame rate

Bug: 18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a

9 years agomedia: allow full range of Vorbis sampling rates
Lajos Molnar [Thu, 4 Dec 2014 17:50:06 +0000 (09:50 -0800)]
media: allow full range of Vorbis sampling rates

Bug: 18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf

9 years agoMerge "Correct check of is user running"
Amith Yamasani [Thu, 4 Dec 2014 23:09:46 +0000 (23:09 +0000)]
Merge "Correct check of is user running"

9 years agoMerge "Dont call close in in BluetoothA2dp finalize"
Mike Lockwood [Thu, 4 Dec 2014 21:41:12 +0000 (21:41 +0000)]
Merge "Dont call close in in BluetoothA2dp finalize"

9 years agoRemove DefaultHostnameVerifier from preloaded-classes.
Alex Klyubin [Thu, 4 Dec 2014 17:40:37 +0000 (09:40 -0800)]
Remove DefaultHostnameVerifier from preloaded-classes.

libcore's DefaultHostnameVerifier no longer exists. See
https://android-review.googlesource.com/#/c/117453/.

Bug: 18481199
Change-Id: I5c07e058aaaf8531d420058cfd104c4e751757a3

9 years agoMerge "Prevent ANR when broadcast receiver is killed"
Craig Mautner [Thu, 4 Dec 2014 01:56:39 +0000 (01:56 +0000)]
Merge "Prevent ANR when broadcast receiver is killed"

9 years agoPrevent ANR when broadcast receiver is killed
Kenji Sugimoto [Thu, 17 Jul 2014 05:50:41 +0000 (14:50 +0900)]
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

9 years agoMerge "Add -Wno-unused-parameter to LOCAL_CFLAGS"
Chih-hung Hsieh [Thu, 4 Dec 2014 01:04:09 +0000 (01:04 +0000)]
Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

9 years agoMerge "RRO: prevent duplicate system overlays"
Adam Lesinski [Wed, 3 Dec 2014 17:44:17 +0000 (17:44 +0000)]
Merge "RRO: prevent duplicate system overlays"

9 years agoCorrect check of is user running
Sergii Skorokhodov [Tue, 11 Nov 2014 07:22:18 +0000 (08:22 +0100)]
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

9 years agoMerge "Fix bug in passing of context flags and version."
Jason Sams [Tue, 2 Dec 2014 23:45:16 +0000 (23:45 +0000)]
Merge "Fix bug in passing of context flags and version."

9 years agoMerge changes If2c7e09f,Ie21f227c
Adam Lesinski [Tue, 2 Dec 2014 22:52:36 +0000 (22:52 +0000)]
Merge changes If2c7e09f,Ie21f227c

* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets

9 years agoMerge "Keep deleteIntent when copying Notification attributes"
Chris Wren [Tue, 2 Dec 2014 22:31:06 +0000 (22:31 +0000)]
Merge "Keep deleteIntent when copying Notification attributes"

9 years agoFix bug in passing of context flags and version.
Jason Sams [Tue, 2 Dec 2014 20:36:43 +0000 (12:36 -0800)]
Fix bug in passing of context flags and version.

Change-Id: Id20906f6f47b573d881025453a3b6356bcf6e9c7

9 years agoMerge "Consider RTL layout in DPAD navigation in AbsSeekBar"
Alan Viverette [Tue, 2 Dec 2014 19:21:21 +0000 (19:21 +0000)]
Merge "Consider RTL layout in DPAD navigation in AbsSeekBar"

9 years agoMerge "[ActivityManager] Fix race condition in pss collection"
Craig Mautner [Tue, 2 Dec 2014 18:57:34 +0000 (18:57 +0000)]
Merge "[ActivityManager] Fix race condition in pss collection"

9 years agoMerge "bug fix possible NPE while startProcessLocked()"
Craig Mautner [Tue, 2 Dec 2014 17:57:11 +0000 (17:57 +0000)]
Merge "bug fix possible NPE while startProcessLocked()"

9 years agoMerge "[ActivityManager] Invalidate last screenshot when activity relaunched"
Craig Mautner [Tue, 2 Dec 2014 17:50:30 +0000 (17:50 +0000)]
Merge "[ActivityManager] Invalidate last screenshot when activity relaunched"

9 years ago[ActivityManager] Fix race condition in pss collection
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

9 years ago[ActivityManager] Invalidate last screenshot when activity relaunched
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

9 years agobug fix possible NPE while startProcessLocked()
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

9 years agoMerge "Avoid overwriting EGL14.EGL_NO_SURFACE"
Jesse Hall [Tue, 2 Dec 2014 00:35:11 +0000 (00:35 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

9 years agoMerge "Prevent EntropyMixer from registering with service manager."
dcashman [Mon, 1 Dec 2014 23:49:25 +0000 (23:49 +0000)]
Merge "Prevent EntropyMixer from registering with service manager."

9 years agoMerge "Added Razer USA, Ltd serval"
Michael Wright [Mon, 1 Dec 2014 23:47:37 +0000 (23:47 +0000)]
Merge "Added Razer USA, Ltd serval"