OSDN Git Service
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"
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 [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"
rpcraig [Wed, 25 Jul 2012 17:10:37 +0000 (13:10 -0400)]
restorecon /data/anr directory.
Restore the security contexts of anr directory
when initially created.
Change-Id: Ia731414ccbcdc7369d24be6db0003c53abcf6ef4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Vairavan Srinivasan [Thu, 31 Mar 2011 20:32:54 +0000 (13:32 -0700)]
VibratorService: Fix to ensure actual delay in a vibrate pattern
delay might timeout early as value of duration isn't updated
correctly in the loop, should the wait be interrupted, to reflect
the elapsed time. Fix is to update duration in the loop.
Change-Id: I525b0e97799b288f46ae3a056cff7dcc69701bb0
Vairavan Srinivasan [Sun, 19 Aug 2012 01:36:03 +0000 (18:36 -0700)]
ActivityThread: Avoid creating duplicate handlers and reuse mH
sMainThreadHandler is used for notification of changes in
SharedPreferences and refers to a new instance of Handler instead
of the existing instance, mH, of the ActivityThread. Fix to reuse
existing handlers associated with main looper.
Change-Id: I794a5802a9eacdb188bd0619db5e70e3ae89a07d
Jason Sams [Thu, 26 Jul 2012 23:56:01 +0000 (16:56 -0700)]
DO NOT MERGE - Fix readback lengths
Change-Id: I4c5f29af03ed3babceef741aa3a982244cfc65d1
Irfan Sheriff [Fri, 17 Aug 2012 23:19:22 +0000 (16:19 -0700)]
Fix system server restart
Change-Id: Ia0b5e337726566ebc96901dadda3fc67eb967755
Henrik B Andersson [Fri, 10 Feb 2012 12:17:40 +0000 (13:17 +0100)]
Release JNI local references as soon as possible.
The JNI layer has a fix amount (512) of jni references.
They should be released as soon as possible. In for
and while loops they can quickly reach the limit.
Change-Id: Id984345e1cc4f7aa6eb31a263b796c3da9edf773
Robert Greenwalt [Fri, 17 Aug 2012 20:28:25 +0000 (13:28 -0700)]
am
6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '
6626398a72ae592e3a9184c9b0868df0fc1f1724':
Fix for updating TCP buffer size when switching network type
Robert Greenwalt [Fri, 17 Aug 2012 20:01:49 +0000 (13:01 -0700)]
Merge "Fix for updating TCP buffer size when switching network type"
Jean-Baptiste Queru [Fri, 17 Aug 2012 17:14:08 +0000 (10:14 -0700)]
am
a688af9c: Merge "TabHost key handling corrected"
* commit '
a688af9c6707c9c2f07cc195b072b6c14be03b63':
TabHost key handling corrected
Jean-Baptiste Queru [Fri, 17 Aug 2012 17:02:49 +0000 (10:02 -0700)]
Merge "TabHost key handling corrected"
Magnus Strandberg [Fri, 17 Aug 2012 09:36:55 +0000 (11:36 +0200)]
Fix for updating TCP buffer size when switching network type
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.
Change-Id: Iaa527c84f56cae108f4c7276bbed10552faaff6c
Joe Onorato [Fri, 17 Aug 2012 07:48:03 +0000 (00:48 -0700)]
am
5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user"
* commit '
5f61087e26013ea2623aecb1783c74a57a9fa49c':
Get rid of LOCAL_MODULE_TAGS := user
Joe Onorato [Fri, 17 Aug 2012 07:40:49 +0000 (00:40 -0700)]
Merge "Get rid of LOCAL_MODULE_TAGS := user"
Joe Onorato [Tue, 22 May 2012 21:16:41 +0000 (14:16 -0700)]
Get rid of LOCAL_MODULE_TAGS := user
Change-Id: I1c4e67f935a7c511cda9980f4475dfd0272617a5
wfeng6 [Mon, 25 Jun 2012 10:48:49 +0000 (18:48 +0800)]
To avoid the JNI memory leaks in video editor codes
There is a protential memory leak in video editor JNI codes.
When importing so many video clips, the number of local reference
will exceed 512, which will cause the Dalvik virtual machine
crash. The patch will free each local reference when it's no
longer used to avoid memory leaks.
Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40
Author: Wei Feng <wei.feng@intel.com>
Signed-off-by: Wei Feng <wei.feng@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 40786
Yong Chen [Fri, 20 Jul 2012 02:35:36 +0000 (10:35 +0800)]
Tests/RS: Add RS context check for RsBalls setAccel()
mRS could be null when lock and unlock screen by pressing power key
several times, it causes RsBalls crash. Add null pointer check to fix.
Change-Id: If37dee8609420daaff17772d5194cad5531f98e6
Author: Yong Chen <yong.a.chen@intel.com>
Signed-off-by: Yong Chen <yong.a.chen@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 31271
The Android Open Source Project [Fri, 17 Aug 2012 01:56:53 +0000 (18:56 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Icb49e9e1f6c6e2be6d863f959a7a782dd442c465
The Android Automerger [Fri, 17 Aug 2012 00:57:44 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Kenny Root [Thu, 16 Aug 2012 23:33:40 +0000 (16:33 -0700)]
am
a950daf5: Merge changes Ieb566a2a,I953057cd
* commit '
a950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
Kenny Root [Thu, 16 Aug 2012 23:06:29 +0000 (16:06 -0700)]
Merge changes Ieb566a2a,I953057cd
* changes:
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:29:47 +0000 (15:29 -0700)]
am
d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"
* commit '
d2fb6e99bda1ae607b5dfbb68905030f2133f8e8':
Fix Issue #35489: drm content corruption on GB
Kenny Root [Thu, 16 Aug 2012 22:29:41 +0000 (15:29 -0700)]
am
9b0da58e: Merge "Introduce a restorecon JNI binding."
* commit '
9b0da58e3a30b760de37138cdd51d20f269c383e':
Introduce a restorecon JNI binding.
Kenny Root [Thu, 16 Aug 2012 22:29:34 +0000 (15:29 -0700)]
am
1090f702: Merge "Remove StatFs from AndroidRuntime JNI"
* commit '
1090f7023abefc448a492e143f76f9e0925fd6ee':
Remove StatFs from AndroidRuntime JNI
Madan Ankapura [Fri, 3 Aug 2012 02:10:22 +0000 (19:10 -0700)]
show 3G icon for CDMA/1xRTT
when config_showMin3G is enabled to true in a CDMA device
Change-Id: I79a4fa200dc406fc7f9f4527165046541961ef69
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
Kenny Root [Thu, 16 Aug 2012 18:38:04 +0000 (11:38 -0700)]
Use Libcore's stat instead of FileUtils#getFileStatus
Remove the last user of FileUtils#getFileStatus and move it to
Libcore.os.stat instead. Then we can remove the JNI code that does the
equivalent of a stat.
Change-Id: Ieb566a2a8a17c2dd0150724b4eb3ac1cc41c823d
Kenny Root [Thu, 16 Aug 2012 18:10:58 +0000 (11:10 -0700)]
Use Libcore.os.stat instead of FileUtils
PackageManagerService just needed to know the owner for this file, so
just use stat instead so we can remove the old JNI code.
This is the last user of FileUtils#getPermissions so just remove the
FileUtils method as well.
Change-Id: I953057cd6b9de4410f33b6f22e4bddff02fe2988
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:45:12 +0000 (14:45 -0700)]
Merge "Fix Issue #35489: drm content corruption on GB"
Kenny Root [Thu, 16 Aug 2012 21:38:30 +0000 (14:38 -0700)]
Merge "Introduce a restorecon JNI binding."
Kenny Root [Thu, 16 Aug 2012 21:37:30 +0000 (14:37 -0700)]
Merge "Remove StatFs from AndroidRuntime JNI"
Kenny Root [Thu, 16 Aug 2012 21:31:31 +0000 (14:31 -0700)]
Remove StatFs from AndroidRuntime JNI
Change-Id: I88039794cf3e4a959b37c29c67f16f2dc0751a5c
Kenny Root [Thu, 16 Aug 2012 21:22:31 +0000 (14:22 -0700)]
am
8942e5a3: Merge "Use libcore Posix class for StatFs implementation"
* commit '
8942e5a32ae2d1a36b65efe5b26cc06227ea0ca5':
Use libcore Posix class for StatFs implementation
Kenny Root [Thu, 16 Aug 2012 20:37:25 +0000 (13:37 -0700)]
Merge "Use libcore Posix class for StatFs implementation"
Kenny Root [Thu, 16 Aug 2012 17:43:47 +0000 (10:43 -0700)]
Use libcore Posix class for StatFs implementation
Remove some JNI and duplicated functionality and use libcore's Posix
class for the statfs function instead.
Change-Id: Ic1e161dc10c18c2c6ee81d895a0efd8910086dbf
Svetoslav Ganov [Thu, 16 Aug 2012 17:36:55 +0000 (10:36 -0700)]
am
8631701b: Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.
* commit '
8631701bb770f3a4e3b2a139dc282f2244fe86e6':
Allow enabled accessibility service to toggle tocuh exploration after an upgrade to JellyBean.