OSDN Git Service
Jake Hamby [Thu, 30 Aug 2012 01:09:29 +0000 (18:09 -0700)]
resolved conflicts for merge of
b35e4d77 to jb-dev-plus-aosp
Change-Id: Idec590dbd9e051a3faeded1af9eb4a78216f0496
Jake Hamby [Wed, 29 Aug 2012 03:11:34 +0000 (20:11 -0700)]
Fix CDMA decoding of multipart UTF-16 SMS messages.
Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.
This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.
Bug:
6939151
Change-Id: Iba9e7156bd7df94e972963959a7ce1c78464f7f5
Jean-Baptiste Queru [Wed, 29 Aug 2012 19:59:06 +0000 (12:59 -0700)]
am
7fecf5f4: Merge "Make addAddress locale safe"
* commit '
7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
Make addAddress locale safe
Jean-Baptiste Queru [Wed, 29 Aug 2012 19:19:03 +0000 (12:19 -0700)]
Merge "Make addAddress locale safe"
Jean-Baptiste Queru [Wed, 29 Aug 2012 18:55:20 +0000 (11:55 -0700)]
am
4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
* commit '
4ba4caede125ff602b0d93f577f9054a07791ff7':
Fix SkBitmap::fPixels not being locked correctly
Jean-Baptiste Queru [Wed, 29 Aug 2012 18:27:31 +0000 (11:27 -0700)]
Merge "Fix SkBitmap::fPixels not being locked correctly"
Jean-Baptiste Queru [Wed, 29 Aug 2012 17:49:25 +0000 (10:49 -0700)]
am
0e0942c7: Merge "Default WiFi sleep policy setting"
* commit '
0e0942c7209c758bc00939ae54059dc24bce3abb':
Default WiFi sleep policy setting
Irfan Sheriff [Wed, 29 Aug 2012 17:49:20 +0000 (10:49 -0700)]
am
48c45d0e: Merge "Fix join scenario with provision discovery"
* commit '
48c45d0e3bcacebfc3635bc893875146b7ecb787':
Fix join scenario with provision discovery
Jean-Baptiste Queru [Wed, 29 Aug 2012 16:50:45 +0000 (09:50 -0700)]
Merge "Default WiFi sleep policy setting"
Irfan Sheriff [Wed, 29 Aug 2012 16:47:27 +0000 (09:47 -0700)]
Merge "Fix join scenario with provision discovery"
Irfan Sheriff [Tue, 28 Aug 2012 23:05:43 +0000 (16:05 -0700)]
Fix join scenario with provision discovery
Bug:
7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
Michal Stawinski [Sun, 8 Jul 2012 10:25:45 +0000 (12:25 +0200)]
Fix SkBitmap::fPixels not being locked correctly
In some cases bitmap's pixels where freed during encoding, which
caused a null pointer dereference.
This fix makes sure that underlaying buffer is locked for the whole
process of compression.
Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
Erik Ljungberg [Mon, 23 Aug 2010 13:13:46 +0000 (15:13 +0200)]
Default WiFi sleep policy setting
Creates a defult.xml setting for WiFi sleep policy.
It is now possible, through device overlays, to change
the default sleep policy to e.g. never in order to improve
user experience of WiFi.
Change-Id: Ie459b8e70fdbc7c605452fe0692d7bc26460e939
Johan Redestig [Tue, 28 Aug 2012 07:28:50 +0000 (09:28 +0200)]
Make addAddress locale safe
Using regular string concatenation to avoid unexpected
results in some locales.
Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad
Daniel Sandler [Tue, 28 Aug 2012 20:19:52 +0000 (13:19 -0700)]
am
ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"
* commit '
ad955fe87f44b43dbb2842fdcbe4e62900b5a07f':
SystemUI: Fix data activity overlay not being removed when data is disabled
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:19:48 +0000 (13:19 -0700)]
am
416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"
* commit '
416362e6d8c8d0a34e09704138688f75aa810c9b':
Change StringTokenizer to TextUtils.StringSplitter
Daniel Sandler [Tue, 28 Aug 2012 19:52:48 +0000 (12:52 -0700)]
Merge "SystemUI: Fix data activity overlay not being removed when data is disabled"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:22:39 +0000 (12:22 -0700)]
Merge "Change StringTokenizer to TextUtils.StringSplitter"
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:08:22 +0000 (11:08 -0700)]
am
78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
* commit '
78ad66b43cf5b649869de18ee9c246c95b135c10':
[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
Jean-Baptiste Queru [Tue, 28 Aug 2012 17:43:10 +0000 (10:43 -0700)]
Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."
Irfan Sheriff [Tue, 28 Aug 2012 00:57:29 +0000 (17:57 -0700)]
am
67ea8c86: Merge "Added a persistent feature in WiFi Direct."
* commit '
67ea8c86419ffbf603052e816d6b1e9e7e20fbb9':
Added a persistent feature in WiFi Direct.
Irfan Sheriff [Tue, 28 Aug 2012 00:54:07 +0000 (17:54 -0700)]
Merge "Added a persistent feature in WiFi Direct."
The Android Open Source Project [Mon, 27 Aug 2012 21:11:17 +0000 (14:11 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I0387880d7a374b53a5d0f58c7c2234a4ae3cf325
Dianne Hackborn [Mon, 27 Aug 2012 19:33:57 +0000 (12:33 -0700)]
am
4763989d: am
32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
* commit '
4763989d95342c25e9b857dc9ee21eb5ebac31d6':
Fixes relative time formatting issue for dates in future
Dianne Hackborn [Mon, 27 Aug 2012 19:31:49 +0000 (12:31 -0700)]
am
32d1fec5: Merge "Fixes relative time formatting issue for dates in future"
* commit '
32d1fec50baaecdea34ae2a47ca808e8e4181ed2':
Fixes relative time formatting issue for dates in future
Dianne Hackborn [Mon, 27 Aug 2012 18:39:10 +0000 (11:39 -0700)]
Merge "Fixes relative time formatting issue for dates in future"
Jean-Baptiste Queru [Mon, 27 Aug 2012 18:29:29 +0000 (11:29 -0700)]
am
26ad1e78: am
03d16e12: Merge "Make setCaptureRate locale safe"
* commit '
26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
Make setCaptureRate locale safe
Jean-Baptiste Queru [Mon, 27 Aug 2012 18:28:00 +0000 (11:28 -0700)]
am
03d16e12: Merge "Make setCaptureRate locale safe"
* commit '
03d16e122aa01f9283836d1e5144428082b4c1cd':
Make setCaptureRate locale safe
Jean-Baptiste Queru [Mon, 27 Aug 2012 17:22:29 +0000 (10:22 -0700)]
Merge "Make setCaptureRate locale safe"
Jean-Baptiste Queru [Mon, 27 Aug 2012 15:13:27 +0000 (08:13 -0700)]
am
e70a32af: am
eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern"
* commit '
e70a32afc5b27ddc9681efd867780a0c4c77edd3':
VibratorService: Fix to ensure actual delay in a vibrate pattern
Jean-Baptiste Queru [Mon, 27 Aug 2012 15:11:19 +0000 (08:11 -0700)]
am
eb00f951: Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern"
* commit '
eb00f951439cd724863d267e8e8d77414383d93f':
VibratorService: Fix to ensure actual delay in a vibrate pattern
Jean-Baptiste Queru [Mon, 27 Aug 2012 14:55:41 +0000 (07:55 -0700)]
Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern"
Yoshihiko Ikenaga [Thu, 16 Aug 2012 14:37:36 +0000 (23:37 +0900)]
Added a persistent feature in WiFi Direct.
Provide a new feature to use persistent group at default.
In the normal connect sequence, if the persistent profile has been
stored, try to use it. Otherwise, a new persistent group is created.
If the persistent profiles are stored over 32, an old profile is
deleted automatically.
Change-Id: Iccb9fa044f1907f0818cd259275e1675f4c3e222
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Johan Redestig [Mon, 27 Aug 2012 08:31:25 +0000 (10:31 +0200)]
Make setCaptureRate locale safe
Dont use the default String.format in setCaptureRate as it is both
locale unsafe and less efficient than regular string concatenation
in this case.
Change-Id: I29418ec0352ef8c79967592b6eb8ff66cc9c99f0
Steve Pomeroy [Mon, 27 Aug 2012 06:20:13 +0000 (02:20 -0400)]
Fixes relative time formatting issue for dates in future
All variations of getRelativeTimeSpanString() now properly handle dates
that are in the future. Prior, the version used by
getRelativeDateTimeString() would occasionally show the time instead of
a date when the future date was the same weekday as the current weekday.
This resulted in the time output being duplicated, eg.: "11:23, 11:23"
Change-Id: If20972a6942cce792fa233437f94dedfb71379f3
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
Dirk Dougherty [Fri, 24 Aug 2012 21:43:18 +0000 (14:43 -0700)]
am
cf9e9d62: Design doc change: Update download zips for design bundle and Roboto.
* commit '
cf9e9d627367d310fb910a052dda1e020748a94c':
Design doc change: Update download zips for design bundle and Roboto.
Dirk Dougherty [Fri, 24 Aug 2012 21:27:23 +0000 (14:27 -0700)]
Design doc change: Update download zips for design bundle and Roboto.
Bug:
7054673
Change-Id: I3a4d883f0d974e6e089c5f232c6d8b61e9c8fc56
Wink Saville [Wed, 22 Aug 2012 05:58:54 +0000 (22:58 -0700)]
Empty DC's apnList when the DC is free.
Not doing this causes DC.apnList's to have multiple entries in the
apnlist which causes DC's to look like its connected to both IMS and
INTERNET. And when selecting CDMA only mode on a Xoom we will not bring
up the connection thus no data connectivity.
Bug:
6939338
Change-Id: I17bc17cd1938ebac773db8131d12d0fa724348b0
The Android Automerger [Fri, 24 Aug 2012 04:30:27 +0000 (21:30 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Wink Saville [Thu, 23 Aug 2012 22:12:31 +0000 (15:12 -0700)]
am
5a60f058: am
13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent"
* commit '
5a60f058891fa5417df7d53be28521b604071fea':
Telephony: Add ICC_UNKNOWN intent
Dianne Hackborn [Thu, 23 Aug 2012 22:12:26 +0000 (15:12 -0700)]
am
bfe20d1a: am
8bfba7df: Merge "fix wrong substring"
* commit '
bfe20d1aa1b1236e6592914c5682c59d94936432':
fix wrong substring
Jean-Baptiste Queru [Thu, 23 Aug 2012 22:12:21 +0000 (15:12 -0700)]
am
d86bebb4: am
322b0a16: Merge "Protecting more views from (bad) MotionEvents"
* commit '
d86bebb4a9aaf3b98f6d5a189fd7733926d85891':
Protecting more views from (bad) MotionEvents
Wink Saville [Thu, 23 Aug 2012 22:09:43 +0000 (15:09 -0700)]
am
13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent"
* commit '
13ab2c9fdaec119a40b628ae772fd1462fbb826d':
Telephony: Add ICC_UNKNOWN intent
Dianne Hackborn [Thu, 23 Aug 2012 22:09:39 +0000 (15:09 -0700)]
am
8bfba7df: Merge "fix wrong substring"
* commit '
8bfba7df376509cc944b80bd1f1715f1ef94b246':
fix wrong substring
Jean-Baptiste Queru [Thu, 23 Aug 2012 22:09:35 +0000 (15:09 -0700)]
am
322b0a16: Merge "Protecting more views from (bad) MotionEvents"
* commit '
322b0a160d29ddbac35d59655111c8730cadd3e2':
Protecting more views from (bad) MotionEvents
Irfan Sheriff [Thu, 23 Aug 2012 21:58:43 +0000 (14:58 -0700)]
Merge "resolved conflicts for merge of
86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp
Irfan Sheriff [Thu, 23 Aug 2012 21:37:06 +0000 (14:37 -0700)]
resolved conflicts for merge of
86bb2258 to jb-dev-plus-aosp
Change-Id: I5f115310948a03d791c201fb605dfbb576c0576e
Wink Saville [Thu, 23 Aug 2012 21:25:23 +0000 (14:25 -0700)]
Merge "Telephony: Add ICC_UNKNOWN intent"
Dianne Hackborn [Thu, 23 Aug 2012 21:10:30 +0000 (14:10 -0700)]
Merge "fix wrong substring"
Alex Yakavenka [Thu, 23 Aug 2012 17:15:22 +0000 (10:15 -0700)]
Telephony: Add ICC_UNKNOWN intent
Change-Id: I1a666973dd23f510a0cce60ef7db462728717fc0
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:08:40 +0000 (14:08 -0700)]
Merge "Protecting more views from (bad) MotionEvents"
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:45:30 +0000 (09:45 -0700)]
am
729f810d: am
8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection"
* commit '
729f810d3bca086cf651aa4e2299594a57d6d543':
WifiStateMachine: ignore auth-fail event during WPS connection
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:43:45 +0000 (09:43 -0700)]
am
8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection"
* commit '
8f7100a03768d2863255024cf0c604cac10c9d5d':
WifiStateMachine: ignore auth-fail event during WPS connection
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:31:02 +0000 (09:31 -0700)]
Merge "WifiStateMachine: ignore auth-fail event during WPS connection"
Jean-Baptiste Queru [Thu, 23 Aug 2012 15:41:55 +0000 (08:41 -0700)]
am
1e739c96: am
a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app"
* commit '
1e739c96246ca7f0991bb783452b405ffd57cad7':
Properly handle quick switch between Home button and Gallery app
Jean-Baptiste Queru [Thu, 23 Aug 2012 15:40:03 +0000 (08:40 -0700)]
am
a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app"
* commit '
a4e34ae82f2ccf037875462809be6e5139807b44':
Properly handle quick switch between Home button and Gallery app
Jean-Baptiste Queru [Thu, 23 Aug 2012 15:04:45 +0000 (08:04 -0700)]
Merge "Properly handle quick switch between Home button and Gallery app"
Johan Rosengren [Mon, 21 Feb 2011 08:49:45 +0000 (09:49 +0100)]
Protecting more views from (bad) MotionEvents
When handling MotionEvents, the method findPointerIndex can return -1
if the current pointer id can't be translated to a pointer index.
Some views are not handling this, which will lead to an out-of-
index crash. In
2585e9b there were checks added, this change adds
some more.
Change-Id: I93ce2420afd83a06b689a1ed35ead7d170cd68f1
Masanori Ogino [Thu, 23 Aug 2012 05:06:45 +0000 (14:06 +0900)]
fix wrong substring
The tokenOffsets is the offset from trimed contentLine.
But it is used in substring as the offset from un-trimed contentLine.
How to reproduce bug (ICS and before):
1. Add a contact record with name and a phone number (ex. 090-1111-2222)
2. Search by "0" in Contacts app
3. Contacts shows a wrong number something like "
0900111102222"
Change-Id: I1e1cb2f3bd135d98e1573a50aa6ddc021af35b9f
Katie McCormick [Wed, 22 Aug 2012 23:21:46 +0000 (16:21 -0700)]
am
645eab64: Merge "Doc update: client javadoc fix for @value." into jb-dev
* commit '
645eab640e9c139b7a4e99c6c4d4f3bb2a86f092':
Doc update: client javadoc fix for @value.
Roman Nurik [Wed, 22 Aug 2012 23:21:40 +0000 (16:21 -0700)]
am
6d672214: Merge "Update TabCompat training sample code download." into jb-dev
* commit '
6d672214ae04e7d8d239c322ec4c79f9ee1feea9':
Update TabCompat training sample code download.
Irfan Sheriff [Wed, 22 Aug 2012 23:12:29 +0000 (16:12 -0700)]
Merge "Fix system server restart" into jb-dev
Jean-Baptiste Queru [Wed, 22 Aug 2012 22:35:57 +0000 (15:35 -0700)]
ignore merge of
2e2849a5 to jb-dev-plus-aosp
Change-Id: Ie13c209a6646a08107ffecc9e63610fd5b9fab55
Katie McCormick [Wed, 22 Aug 2012 21:33:26 +0000 (14:33 -0700)]
Merge "Doc update: client javadoc fix for @value." into jb-dev
Arik Nemtsov [Wed, 22 Aug 2012 21:27:15 +0000 (16:27 -0500)]
WifiStateMachine: ignore auth-fail event during WPS connection
Disregard auth failure events during WPS connection. The EAP sequence is
retried several times, and there might be failures (especially for wps pin).
We will get a WPS_XXX event at the end of the sequence anyway.
Without this change, the SupplicantStateTracker class will disable
the WPS network we are connecting to after 2 failed authentication events.
Then, even if WPS succeeds, we will never connect to the selected network.
Change-Id: I57c8e508bfd738405b7f2c2c2325df7838e1b4af
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Stephen Hines [Wed, 22 Aug 2012 21:24:39 +0000 (14:24 -0700)]
am
56c6392f: (-s ours) am
9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '
56c6392fefba53e72c9effb7b5c92c64e03ecfd5':
DO NOT MERGE - Fix readback lengths
Stephen Hines [Wed, 22 Aug 2012 21:23:01 +0000 (14:23 -0700)]
am
9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths"
* commit '
9f7fa4c4177c405566445760ec7f4c27e812cd7f':
DO NOT MERGE - Fix readback lengths
Stephen Hines [Wed, 22 Aug 2012 21:06:37 +0000 (14:06 -0700)]
Merge "DO NOT MERGE - Fix readback lengths"
Katie McCormick [Mon, 20 Aug 2012 19:38:08 +0000 (12:38 -0700)]
Doc update: client javadoc fix for @value.
Change-Id: I9e1327a21d0755fc10b4e5cb4aa9ecd30053b6ef
Justin Ho [Wed, 22 Aug 2012 19:58:09 +0000 (12:58 -0700)]
am
72404a82: Merge "Update Back softkey icon Bug:
6020915" into jb-dev
* commit '
72404a82d30ff0631a31aed93f221c1fdf210888':
Update Back softkey icon Bug:
6020915
Roman Nurik [Wed, 22 Aug 2012 19:30:45 +0000 (12:30 -0700)]
Merge "Update TabCompat training sample code download." into jb-dev
Wink Saville [Wed, 22 Aug 2012 18:49:47 +0000 (11:49 -0700)]
Merge "Empty DC's apnList when the DC is free." into jb-dev
Roman Nurik [Wed, 22 Aug 2012 17:07:38 +0000 (10:07 -0700)]
Update TabCompat training sample code download.
Depends on If6face5a0548107f7fd273e466b1ced2790f4f3a
Change-Id: I06c13cd02ca791a57a374b3c4af4b46e68dacda4
Irfan Sheriff [Wed, 22 Aug 2012 18:09:17 +0000 (11:09 -0700)]
am
e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"
* commit '
e5773274d68cf91cb9966f47c54ce69a7a6b03f4':
WifiWatchdog: handle exception from ArpPeer
Irfan Sheriff [Wed, 22 Aug 2012 18:01:03 +0000 (11:01 -0700)]
am
2140d1de: Merge "Avoid system_server crashing due to mac address is null"
* commit '
2140d1de47579db839b6a4ccc87394e80449d7a6':
Avoid system_server crashing due to mac address is null
Irfan Sheriff [Wed, 22 Aug 2012 17:57:49 +0000 (10:57 -0700)]
Merge "WifiWatchdog: handle exception from ArpPeer"
Irfan Sheriff [Wed, 22 Aug 2012 17:48:23 +0000 (10:48 -0700)]
Merge "Avoid system_server crashing due to mac address is null"
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:46:41 +0000 (07:46 -0700)]
am
6ffe2594: Merge "restorecon /data/anr directory."
* commit '
6ffe2594674f250c16c5e3055aa69680efaa6f69':
restorecon /data/anr directory.
Jean-Baptiste Queru [Wed, 22 Aug 2012 14:18:39 +0000 (07:18 -0700)]
Merge "restorecon /data/anr directory."
Wink Saville [Wed, 22 Aug 2012 05:58:54 +0000 (22:58 -0700)]
Empty DC's apnList when the DC is free.
Not doing this causes DC.apnList's to have multiple entries in the
apnlist which causes DC's to look like its connected to both IMS and
INTERNET. And when selecting CDMA only mode on a Xoom we will not bring
up the connection thus no data connectivity.
Bug:
6939338
Change-Id: I17bc17cd1938ebac773db8131d12d0fa724348b0
Chih-Wei Huang [Wed, 22 Aug 2012 03:26:51 +0000 (11:26 +0800)]
Avoid system_server crashing due to mac address is null
It's possible that the mac address is null (getMacAddress() of WifiNative.java).
In this case system_server will crash like:
E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: WifiWatchdogStateMachine
E AndroidRuntime: java.lang.NullPointerException
E AndroidRuntime: at android.net.arp.ArpPeer.<init>(ArpPeer.java:57)
E AndroidRuntime: at android.net.wifi.WifiWatchdogStateMachine.doArpTest(WifiWatchdogStateMachine.java:866)
Check the mac address before parsing to avoid crashing.
Change-Id: I5d4205c04d479a3a2837172c6382816ea4bf74d6
Dianne Hackborn [Tue, 21 Aug 2012 22:39:42 +0000 (15:39 -0700)]
am
b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
* commit '
b0b4a704400319ceaa1002f3194a40553a00cc82':
ActivityThread: Avoid creating duplicate handlers and reuse mH
Justin Ho [Tue, 21 Aug 2012 22:19:15 +0000 (15:19 -0700)]
Merge "Update Back softkey icon Bug:
6020915" into jb-dev
Dianne Hackborn [Tue, 21 Aug 2012 22:12:45 +0000 (15:12 -0700)]
Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH"
Justin Ho [Tue, 21 Aug 2012 21:21:29 +0000 (14:21 -0700)]
Update Back softkey icon
Bug:
6020915
Change-Id: I780f09bd1e99a10b2189ab253dd1a082118a385d
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:00:11 +0000 (14:00 -0700)]
am
b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
* commit '
b8da225f26b689288710ff0eafefa906b4f5700f':
Tests/RS: Add RS context check for RsBalls setAccel()
Jean-Baptiste Queru [Tue, 21 Aug 2012 20:09:18 +0000 (13:09 -0700)]
Merge "Tests/RS: Add RS context check for RsBalls setAccel()"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:45 +0000 (14:50 -0700)]
am
26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
* commit '
26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
To avoid the JNI memory leaks in video editor codes
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:50:40 +0000 (14:50 -0700)]
am
f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
* commit '
f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
Switch widget: Fix ON/OFF option update error
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:29:51 +0000 (14:29 -0700)]
Merge "To avoid the JNI memory leaks in video editor codes"
Jean-Baptiste Queru [Mon, 20 Aug 2012 21:28:32 +0000 (14:28 -0700)]
Merge "Switch widget: Fix ON/OFF option update error"
Kenny Root [Mon, 20 Aug 2012 19:55:11 +0000 (12:55 -0700)]
am
f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit '
f029c22f82573e7fee7c7e0cca4439fe78300bac':
Use Libcore.os.umask for setting umask
Kenny Root [Mon, 20 Aug 2012 19:32:14 +0000 (12:32 -0700)]
Merge "Use Libcore.os.umask for setting umask"
Kenny Root [Fri, 17 Aug 2012 15:45:55 +0000 (08:45 -0700)]
Use Libcore.os.umask for setting umask
Libcore.os now provides a umask method call, so just use that since it's
available.
Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34
Dirk Dougherty [Mon, 20 Aug 2012 18:42:30 +0000 (11:42 -0700)]
am
a18cfcca: Doc change: Remove japanese localized index page.
* commit '
a18cfccac509e124d0a80c109a5711b336d41f75':
Doc change: Remove japanese localized index page.
Dirk Dougherty [Mon, 20 Aug 2012 18:13:27 +0000 (11:13 -0700)]
Doc change: Remove japanese localized index page.
Change-Id: I69b60435e7062d6ec39fe91595232695a37f591d
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:45:17 +0000 (10:45 -0700)]
am
e0024573: Merge "Release JNI local references as soon as possible."
* commit '
e00245737cc4844b77f95538e0728a4166b856a0':
Release JNI local references as soon as possible.
Amith Yamasani [Mon, 20 Aug 2012 17:45:12 +0000 (10:45 -0700)]
am
a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit '
a3db5297cda370ce41db99b6839cd9528c31ef7c':
ProviderMap: remove hashmap when entire user specific entries are removed
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:17:44 +0000 (10:17 -0700)]
Merge "Release JNI local references as soon as possible."
Amith Yamasani [Mon, 20 Aug 2012 17:16:36 +0000 (10:16 -0700)]
Merge "ProviderMap: remove hashmap when entire user specific entries are removed"