63590 Commits

Author SHA1 Message Date
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
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
Jean-Baptiste Queru
00f94e88f9 Merge "Enable chromium http stack for x86" 2012-05-03 09:02:15 -07:00
Jun Tian
ba71cdcba4 Enable chromium http stack for x86
Use chromium http stack as the online media http stack for x86 platform.

Change-Id: I16a7a8697127a51fab8105833f7463911852f0b3
2012-05-02 15:12:45 +08:00
Jean-Baptiste Queru
1b34c1bc24 Merge "stagefright: Remove useless declarations" 2012-05-01 14:48:06 -07:00
Masanori Ogino
c362f0cd50 Lid switch state is incorrect
InputManager#getSwitchState() returns AKEY_STATE_UP(0=OPEN)
and AKEY_STATE_DOWN(1=CLOSE).
mLidOpen is opposite from a real lid status.

Change-Id: I40aa4e0defb95d82b6144ff6b7514f721bf9030f
2012-05-01 13:02:06 -07:00
Jean-Baptiste Queru
93a8225e54 Merge "Improve robustness of resource overlay test suite." 2012-05-01 09:20:47 -07:00
Jean-Baptiste Queru
b2228eb714 Merge "Runtime resource overlay: clean-up." 2012-05-01 09:20:32 -07:00
Jean-Baptiste Queru
9e3bc3f61d Merge "Build overlay packages just like regular packages." 2012-05-01 08:49:38 -07:00
Jean-Baptiste Queru
6a8186fb88 Merge "Fixed group and child view caching in SimpleExpandableListAdapter." 2012-05-01 06:43:03 -07:00
Jean-Baptiste Queru
cbc71bd73f Merge "Fix off-by-one error when filtering application UIDs" 2012-05-01 06:42:36 -07:00
Jean-Baptiste Queru
7a0829850e Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"." 2012-05-01 06:42:12 -07:00
Jean-Baptiste Queru
4426961e7b Merge "Avoiding horizontal keypad navigation trapping within gallery." 2012-05-01 05:52:22 -07:00
Jean-Baptiste Queru
2066f7d986 Merge "Prevent empty overflow popup when there are no overflow items." 2012-05-01 05:52:12 -07:00
Jean-Baptiste Queru
d805c67749 Merge "Possible NullPointerException in restorePanelState" 2012-05-01 05:52:00 -07:00
Jean-Baptiste Queru
bfe71c35a8 Merge "statistics from some cpus don't fit" 2012-05-01 05:51:49 -07:00
Jean-Baptiste Queru
bda124453d Move kxml2 to prebuilts/misc
Change-Id: Ie4b45d2073f26d8313843f9860cf658e288c850b
2012-04-30 17:35:26 -07:00
Jeff Brown
c5b755cd5d Merge "Modify getState to prefer AKEY_STATE_DOWN and AKEY_STATE_UP over AKEY_STATE_UNKNOWN." 2012-04-30 17:18:44 -07:00
Dianne Hackborn
d29032e362 Merge "Do not dispatch context selection events to non-visible fragments." 2012-04-25 15:41:42 -07:00
Seohyeon.Song
5cc510bf89 FileInputStream is not closed in "UserManager.java : readUserList()"
Change-Id: I50f54c70c8b6bc808fa59ce589b0480780cc811b
2012-04-25 18:20:05 +09:00
Dianne Hackborn
cda8329e37 Merge "Distance max set incorrectly" 2012-04-24 14:38:32 -07:00
Jake Wharton
0e567987d7 Do not dispatch context selection events to non-visible fragments.
When used in a `ViewPager`, fragments that are present on the adjacent,
cached pages will receive context selection dispatches which, depending
on your fragment contents, can be difficult to determine whether or not
the event truly originated from your view.

By using the visible hint we restrict dispatching to only those fragments
which are marked as being visible. Since the fragment pager adapter
updates this setting properly most implementations will be afforded this
fix without any change required. If the user is implementing their own
adapter they likely already understand the implications of these cached
fragments and the reponsibility for updating the boolean falls to them.

Mirrors support library change Ie6a72c1c82c2784774373670007b6f5948fe16da

Change-Id: I1bc6f74e26660ef4a3c20419c077e37992412e94
2012-04-23 22:02:32 -07:00
Dianne Hackborn
3c40675f6f Merge "Fix potential NPE when saving fragment state." 2012-04-23 19:00:48 -07:00
Jake Wharton
258029eeaa Fix potential NPE when saving fragment state.
If a fragment's saved view state is null and the user
visible hint is true then the `result` bundle will have
never been initialized to a value resulting in a
`NullPointerException`.

Mirrors support library change I8ba585bc6b9298841490d64bc22a8219cd261adb.

Change-Id: Iabd5ac293d2ece3771da9ef257479eca0dcd523c
2012-04-23 18:54:27 -07:00
Andreas Sandblad
8239940d0e Distance max set incorrectly
The distance max used in the MotionRange is calculated
incorrectly.

Looks like a copy-and-paste error.

Change-Id: I2b6daab088df0fb69e05682b67ca33524ff35987
2012-04-23 09:53:30 +02:00
Dianne Hackborn
fee88fdb64 Merge "Issue: Foreground activity performs [Resume] and [Pause] when any process died in sleep mode." 2012-04-20 18:36:53 -07:00