63620 Commits

Author SHA1 Message Date
Wink Saville
bc69f97c66 Merge "Adds documentation to CdmaCellLocation get lat/long methods" 2012-06-11 15:57:03 -07:00
Jean-Baptiste Queru
68ecb32eed Merge "stagefright aacenc: Move system headers before local headers" 2012-06-11 14:02:08 -07:00
Martin Storsjo
8606e6b4da stagefright aacenc: Move system headers before local headers
This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.

Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
2012-06-11 23:32:42 +03:00
Jean-Baptiste Queru
19703b13a6 Merge "Avoid memory leak in the Shutdown confirmation dialog." 2012-06-11 11:21:58 -07:00
Jean-Baptiste Queru
7d77977ffa Merge "Fix Force Close when enable airplane mode" 2012-06-11 07:27:05 -07:00
Mattias Petersson
8b4b63403a Avoid memory leak in the Shutdown confirmation dialog.
How to reproduce:
1) Lock the screen.
2) Open the Phone options menu by long pressing the power
   button.
3) Tap "Power off" to display the confirmation dialog.
4) Repeat step 2 and 3 a few times (without closing the
   confirmation dialog.

Each time the confirmation dialog is displayed, a new
instance is created. A stack of confirmation dialogs are
created on the screen.

This is fixed by making sure the previous dialog is
dismissed before launching a new dialog.

Change-Id: I6b6c61ccc56364b66eed3528019f761e75bbe268
2012-06-11 10:18:09 +02:00
Dianne Hackborn
aa8cac86d8 Merge "frameworks/base: release references of UriPermissionOwner" 2012-06-08 18:45:10 -07:00
Dianne Hackborn
2d18c60a0b Merge "Performance: Activity manager perf unnecessary recalc of oom_adj" 2012-06-08 18:40:04 -07:00
Dianne Hackborn
c9aa32e93f Merge "Fix dumpPowerState method" 2012-06-08 18:33:48 -07:00
Jean-Baptiste Queru
2a393a99dc Merge "MountService: unlink death notification when unregistering listeners" 2012-06-08 14:30:52 -07:00
Jean-Baptiste Queru
ce4de8d141 Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||" 2012-06-08 14:10:11 -07:00
Kenny Root
60b3d59d7f Merge "Modify installd to set the SELinux security context on package directories." 2012-06-08 12:27:42 -07:00
Kenny Root
7b2d056342 Merge "Add JNI bindings for some of the libselinux interfaces." 2012-06-08 12:25:07 -07:00
Jean-Baptiste Queru
3e3d641c61 Merge "Added mpga as valid MediaFile extension" 2012-06-08 10:20:57 -07:00
Jean-Baptiste Queru
b77338703f Merge "Aligning native Parcel implementation to Java." 2012-06-08 08:03:03 -07:00
Björn Davidsson
90f9e31343 Performance: Activity manager perf unnecessary recalc of oom_adj
If an activity has bound servicesor content providers,
updateLruProcessInternalLocked will be called recursively with
the oomAdj flag set, resulting in several recalculations of oomAdj
with unchanged data. Doing it at the end of the top level call to
updateLruProcessInternalLocked should be sufficient.

Change-Id: I95e27011e1d3519f256a9bd756cbb18d43e8db29
2012-06-08 12:56:14 +02:00
Jean-Baptiste Queru
9e22d9c514 Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6." 2012-06-05 18:31:02 -07:00
Ying Wang
41bdb03ffb Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
With SDK 10.6 without _DARWIN_UNLIMITED_STREAMS aapt sometimes fails
right away with the error "Too many open files" when calling fopen().

Change-Id: Ifa7bd8a9530d706aa47f98be8186f1aefe943d76
2012-06-05 14:30:39 -07:00
Tor Norbye
36ac43ba99 Merge "Tweak default ignore-assets path" 2012-06-05 07:42:43 -07:00
Magnus Strandberg
86b14cdf8d Aligning native Parcel implementation to Java.
The Java implementation of writing the RPC response header
calculates the length of the header including the 4 bytes
specifying the header length but the native implementation
excludes the 4 bytes specifying the length from the header
length.
The native implementation has been aligned to the Java impl.

Change-Id: I325bf272a63152d8fded4cf4e51a906b5a9bfe19
2012-06-05 10:35:24 +02:00
Mathias Franzén
2fe37b7005 Added mpga as valid MediaFile extension
Added mpga as a valid media file extension, it is treated as mp3.

Change-Id: Ie39036d61b6ca50439861fa10be0d824dcc65ed3
2012-06-05 08:20:16 +02:00
Tor Norbye
e0219c8baa Tweak default ignore-assets path
Add .DS_Store to the list of ignored files that are silently
ignored (other dot-files are ignored but aapt emits a "(skipping <x>)"
message.)

Also, add a "!" prefix to the *~ pattern for Emacs/Vim/Gedit backup
files.

Finally, move the !*.scc pattern up in front of the .* pattern, such
that it doesn't match the earlier .* pattern (which is verbose, unlike
!*.scc).

Change-Id: Id3e96490f1802486aea8c58366d43e9d413971b8
2012-06-04 10:41:38 -07:00
jaiyoung.park
15415f57a3 Fix dumpPowerState method
dumpPowerState method shows the current power manger service state but,
BUTTON_BRIGHT_BIT is omitted.

Add a routine of checking BUTTON_BRIGHT_BIT
Signed-off-by: jaiyoung.park <jaiyoung.park@lge.com>

Change-Id: I00484fb384963bafdc58ce89b3251a1f5585d992
2012-06-04 09:33:54 +09:00
Jean-Baptiste Queru
0748a56987 Merge "aapt: Remove terminal pointer incrementaion" 2012-06-02 09:21:37 -07:00
Raphaël Moll
54a2a6df41 Merge "Merge "Fix length of pattern." DO NOT MERGE." 2012-05-30 14:46:35 -07:00
Jean-Baptiste Queru
84bda3e3c6 Merge "Input: Fix some Applications ANR issue in monkey test" 2012-05-29 13:05:35 -07:00
Jean-Baptiste Queru
b8e0fd45b0 Merge "Lid switch state is incorrect" 2012-05-29 13:04:58 -07:00
Zhenghua Wang
edded60d18 Input: Fix some Applications ANR issue in monkey test
Issue Description:
When do monkey test on some applications, there is big probability get ANR issue. one example is as following:
    adb shell monkey -p com.google.android.street -v 500000

Root Cause:
situation 1. InputDispatcher Thread calls findTouchedWindowTargetsLocked routine, there is a AMOTION_EVENT_ACTION_DOWN event
             and it can find a splittable touched window for this event , then mTouchState.split set to true.

situation 2. WMS Thread calls setInputWindows routine and all TouchedWindows associated with mTouchState are removed ,
             mTouchState.split status still keep true.

situation 3. InputDispatcher Thread calls findTouchedWindowTargetsLocked routine, there is a AMOTION_EVENT_ACTION_POINTER_DOWN event
             and it can find found touched window, exit window loop in following code :
                  if (windowInfo->visible) {
                    if (! (flags & InputWindowInfo::FLAG_NOT_TOUCHABLE)) {
                        isTouchModal = (flags & (InputWindowInfo::FLAG_NOT_FOCUSABLE
                                | InputWindowInfo::FLAG_NOT_TOUCH_MODAL)) == 0;
                        if (isTouchModal || windowInfo->touchableRegionContainsPoint(x, y)) {
                            if (! screenWasOff
                                    || (flags & InputWindowInfo::FLAG_TOUCHABLE_WHEN_WAKING)) {
                                newTouchedWindowHandle = windowHandle;
                            }
                            break; // found touched window, exit window loop
                        }
                    }

situation 4. The following code will have problem after situation 3 in below conditions:
             newTouchedWindowHandle doesn't support split , isSplit is true ( last time touched window is splittable )
             mTempTouchState.getFirstForegroundWindowHandle will always return NULL due to situation 2

            // Figure out whether splitting will be allowed for this window.
            if (newTouchedWindowHandle != NULL
                    && newTouchedWindowHandle->getInfo()->supportsSplitTouch()) {
                // New window supports splitting.
                isSplit = true;
            } else if (isSplit) {
                // New window does not support splitting but we have already split events.
                // Assign the pointer to the first foreground window we find.
                // (May be NULL which is why we put this code block before the next check.)
                newTouchedWindowHandle = mTempTouchState.getFirstForegroundWindowHandle();
            }

            The window says it does not want to support splitting, so the touches should go to one of the previously split windows except
            that there are none, which result to "goto Unresponsive" in findtouchedWindowTargetsLocked routine.
            This is not the correct behavior because the user did actually touch something.

situation 5. InputDispatcher Thread will call dispatchOnce repeated to try to dispatch this AMOTION_EVENT_ACTION_POINTER_DOWN event,
             then ANR timeout ( 5000ms ) will be exceeded after several times "goto Unresponsive"in findtouchedWindowTargetsLocked routine.

Solution:
In situation 4 we should drop the touch. If the newly touched window was splittable then we wouldn't drop the touch.
It's only when the newly touched window was not splittable where we will drop the touch.

Change-Id: Iab2c06ce0597ac77eb886ccd9d84646c86723bdb
Author: Jeffrey Brown <jeffbrown@android.com>
Author: Erjun Ding <erjunx.ding@intel.com>
Author: Zhenghua Wang <zhenghua.wang@intel.com>
Author: Jack Ren <jack.ren@intel.com>
Author: Bruce Beare <bruce.j.beare@intel.com>
2012-05-28 21:56:03 +08:00
Jean-Baptiste Queru
23cad6eb2b Merge "stagefright aacenc: Fix reading out of bounds in pow2_xy" 2012-05-25 10:38:06 -07:00
Martin Storsjo
9af8cfa60f stagefright aacenc: Fix reading out of bounds in pow2_xy
This fixes cases where x was a large number, causing fPart to
exceed the 32 bit signed integer range (while fitting in an
unsigned 32 bit integer), making the table index a negative
number.

Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
2012-05-25 19:49:59 +03:00
Jean-Baptiste Queru
fd63c85742 Merge "Wipe the user data out in any case." 2012-05-25 07:31:27 -07:00
Ying Wang
98a0607a31 Merge "Fix length of pattern." DO NOT MERGE.
After skipping * with "token++", the length should decrease by 1 as
well.

(merged from 996b073e813ba1a22a13282ccdebb664f14ba898)

Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
2012-05-24 11:07:14 -07:00
Amith Yamasani
d4cb08df75 Merge "FileInputStream is not closed in "UserManager.java : readUserList()"" 2012-05-24 09:42:29 -07:00
Jean-Baptiste Queru
55536138cc Merge "libstagefright/matroska: Fix build with gcc 4.7" 2012-05-24 06:53:51 -07:00
Jean-Baptiste Queru
05cd296e71 Merge "libmedia: Fix build with gcc 4.7" 2012-05-24 06:25:55 -07:00
Jean-Baptiste Queru
7a52ba8a02 Merge "Add a new API on DRM Framework for streaming" 2012-05-23 14:06:54 -07:00
Jean-Baptiste Queru
d9bde6024e Merge "String on Toast notification does not aligned to center" 2012-05-22 13:52:59 -07:00
Taeho Kim
1ee2a062e0 String on Toast notification does not aligned to center
If length of the string being showed on Toast is short (less than 8 chars),
it is aligned to left rather than to center.
Added attribute android:layout_gravity="center_horizontal" on the TextView where Toast's message are shown to fix issue.

Change-Id: I77669fd8a11d1ec8f6b082348eb818671ce158bb
Signed-off-by: Taeho Kim <jyte82@gmail.com>
2012-05-23 02:10:16 +09:00
Vairavan Srinivasan
2ed524966d frameworks/base: release references of UriPermissionOwner
Change-Id: I72e2310458de15f18e6f2c67f383bbb5c8f60ae2
2012-05-22 00:06:15 -07:00
Jean-Baptiste Queru
64f77c5e31 Merge "stagefright avcenc: Use intptr_t for casting pointers to integers" 2012-05-21 14:12:56 -07:00
Jean-Baptiste Queru
6fd507b927 Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting" 2012-05-21 14:12:49 -07:00
Raphael Moll
613945011e Merge "Support a new ANDROID_AAPT_IGNORE env var." 2012-05-18 13:00:31 -07:00
Jean-Baptiste Queru
c0f1738357 Merge "Move kxml2 to prebuilts/misc" 2012-05-18 09:51:04 -07:00
Raphael Moll
90897ed87b Support a new ANDROID_AAPT_IGNORE env var.
AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.
If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.
Otherwise a default is used that matches the current behavior.

Added a command-line option for it:
  aapt di --ignore-assets "foo*:*.blah"

SDK Bug: 5343 24067

Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
2012-05-09 21:16:26 -07:00
Christopher Tate
ad3f86a526 Merge "Fixed x86 GCC 4.6 compilation error about unused variable" 2012-05-09 14:12:59 -07:00
Andrew Hsieh
1f57f6e0de Fixed x86 GCC 4.6 compilation error about unused variable
Change-Id: I97a24cc25f71db4e61e9d93cd64a51bb16d2e09a
2012-05-08 12:31:23 -07:00
Conley Owens
a10cc893f7 Merge "Revert "Telephony: Register/Unregister Phones with CallManager"" 2012-05-04 17:56:14 -07:00
Conley Owens
6a0f525a16 Revert "Telephony: Register/Unregister Phones with CallManager"
This reverts commit cbca38522ca90322cfc9ccbb7872586807bf6c48
2012-05-04 17:41:32 -07:00
Conley Owens
6a1dca3e1c Merge "Telephony: Register/Unregister Phones with CallManager" 2012-05-04 17:40:56 -07:00
Jean-Baptiste Queru
4b27125d88 Merge changes Ib28636e6,I93ebc433
* changes:
  WallpaperManagerService does not properly propagate setDimensionHints()
  ImageWallpaper : get bitmap width before calc screen offset
2012-05-04 11:05:44 -07:00