63659 Commits

Author SHA1 Message Date
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
kenshin
131ecf2b41 Add support for Caller Name Display
Copied relevant parts from CdmaConnection.java to get the information
as/if presented by network operator (Fido/Rogers in canada provide that
information, and it get displayed if there's no match in phonebook).
Although it works (the nale is displayed when the call is received),
the information is not stored (not kept in the log).

* Patch Set 2 : correct coding style
* Patch Set 3 : promote [get]cnapName, [get]cnapNapePresentation to parent
                class (Connection)
* Patch Set 4 : -remove ref to CDMA in get[CnapName|CnapNamePresentation] headers
                -remove unnecessary self ref-reference
* Patch Set 5 : -add forgoten "protected" modifier to newly promoted class memebers

Change-Id: I2279f75d679d5afa716d9904fc3b3e33c77948c6
2012-06-04 13:36:18 -04: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
Danny Baumann
73f5618ab4 Parcel compRequired flag correctly.
This should fix a couple of cases (e.g. SET_UP_MENU responses for Dual
SIM adapters) whether a command response would be rejected due to a
compRequired flag mismatch between the command sent to the Stk app and
the response received from it.

The problem was:
- STK service received command without compRequired flag set
- it passes it to the STK app, which sees compRequired set
- STK app passes back the response with the user selection
- STK service gets the response, which has compRequired set
- it discards the response, as the command details don't match
  (CatService.java:646)
2012-06-01 10:24:51 +02: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
Chih-Wei Huang
30768cfd28 Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm
This patch is required to enable chrome http stack on x86.

This is just clean-up to make it the same as the WebKit change:
https://android-review.googlesource.com/#/c/30891

Change-Id: Ie88ab86de9a32de5e8b02adb129e01203dd5637a
2012-05-09 22:58:32 +08: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
Sean Barbeau
67662767d9 Adds utility method to convert 0.25 secs to decimal degrees
This patch adds a utility method that converts latitude and longitude
in quarter seconds units to decimal degrees units.  The Telephony API
returns CDMA base station latitude and longitude in quarter seconds
due to a 3GPP telecom standard, while the Android Location API, and
the vast majority of application-level code, uses decimal degrees.

For example, to measure the distance from the user's current location
to the base station using the Location API Location.distanceBetween()
method (http://goo.gl/YjO8O), the base station lat and long would need
to be converted to decimal degrees first.

Since most application developers will likely never use lat/long information
in quarter seconds units, and instead will need this information in decimal
degrees, this utility method will frequently be used by anyone querying
base station location data from CdmaCellLocation.

Sample values to test conversion:

0.25 seconds: lat = 399491, long = -1189145
is equivalent to
decimal degrees: lat = 27.742430555555554, long = -82.57951388888888

Change-Id: If03e741f5035a37519f50d4fb2fb3e3eef2505da
Signed-off-by: Sean Barbeau <sjbarbeau@gmail.com>
2012-05-02 16:22:16 -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