drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,569 Commits 1 Branch 0 Tags
Commit Graph

80569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
cf9e9d6273 Design doc change: Update download zips for design bundle and Roboto. 
Bug: 7054673
Change-Id: I3a4d883f0d974e6e089c5f232c6d8b61e9c8fc56
 2012-08-24 14:27:23 -07:00
Wink Saville
9e698c6c3a 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
 2012-08-24 13:24:40 -07:00
The Android Automerger
c56789731f merge in jb-mr0-release history after reset to jb-dev 2012-08-23 21:30:27 -07:00
Wink Saville
4e9c7e3f60 am 5a60f058: am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent" 
* commit '5a60f058891fa5417df7d53be28521b604071fea':
  Telephony: Add ICC_UNKNOWN intent
 2012-08-23 15:12:31 -07:00
Dianne Hackborn
513f68bc5a am bfe20d1a: am 8bfba7df: Merge "fix wrong substring" 
* commit 'bfe20d1aa1b1236e6592914c5682c59d94936432':
  fix wrong substring
 2012-08-23 15:12:26 -07:00
Jean-Baptiste Queru
790d34039d am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit 'd86bebb4a9aaf3b98f6d5a189fd7733926d85891':
  Protecting more views from (bad) MotionEvents
 2012-08-23 15:12:21 -07:00
Wink Saville
5a60f05889 am 13ab2c9f: Merge "Telephony: Add ICC_UNKNOWN intent" 
* commit '13ab2c9fdaec119a40b628ae772fd1462fbb826d':
  Telephony: Add ICC_UNKNOWN intent
 2012-08-23 15:09:43 -07:00
Dianne Hackborn
bfe20d1aa1 am 8bfba7df: Merge "fix wrong substring" 
* commit '8bfba7df376509cc944b80bd1f1715f1ef94b246':
  fix wrong substring
 2012-08-23 15:09:39 -07:00
Jean-Baptiste Queru
d86bebb4a9 am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit '322b0a160d29ddbac35d59655111c8730cadd3e2':
  Protecting more views from (bad) MotionEvents
 2012-08-23 15:09:35 -07:00
Irfan Sheriff
2a4aaf133c Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp 2012-08-23 14:58:43 -07:00
Irfan Sheriff
2e5b13ef95 resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp 
Change-Id: I5f115310948a03d791c201fb605dfbb576c0576e
 2012-08-23 14:37:06 -07:00
Wink Saville
13ab2c9fda Merge "Telephony: Add ICC_UNKNOWN intent" 2012-08-23 14:25:23 -07:00
Dianne Hackborn
8bfba7df37 Merge "fix wrong substring" 2012-08-23 14:10:31 -07:00
Alex Yakavenka
ceb9bbc5df Telephony: Add ICC_UNKNOWN intent 
Change-Id: I1a666973dd23f510a0cce60ef7db462728717fc0
 2012-08-23 14:09:51 -07:00
Jean-Baptiste Queru
322b0a160d Merge "Protecting more views from (bad) MotionEvents" 2012-08-23 14:08:40 -07:00
Jean-Baptiste Queru
9455f8f266 am 729f810d: am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection" 
* commit '729f810d3bca086cf651aa4e2299594a57d6d543':
  WifiStateMachine: ignore auth-fail event during WPS connection
 2012-08-23 09:45:30 -07:00
Jean-Baptiste Queru
729f810d3b am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection" 
* commit '8f7100a03768d2863255024cf0c604cac10c9d5d':
  WifiStateMachine: ignore auth-fail event during WPS connection
 2012-08-23 09:43:45 -07:00
Jean-Baptiste Queru
8f7100a037 Merge "WifiStateMachine: ignore auth-fail event during WPS connection" 2012-08-23 09:31:03 -07:00
Jean-Baptiste Queru
79f6c5f567 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
 2012-08-23 08:41:55 -07:00
Jean-Baptiste Queru
1e739c9624 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
 2012-08-23 08:40:03 -07:00
Jean-Baptiste Queru
a4e34ae82f Merge "Properly handle quick switch between Home button and Gallery app" 2012-08-23 08:04:46 -07:00
Johan Rosengren
0dc291eef6 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
 2012-08-23 13:46:14 +02:00
Masanori Ogino
08bab56f68 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
 2012-08-23 14:06:45 +09:00
Katie McCormick
9447af12e2 am 645eab64: Merge "Doc update: client javadoc fix for @value." into jb-dev 
* commit '645eab640e9c139b7a4e99c6c4d4f3bb2a86f092':
  Doc update: client javadoc fix for @value.
 2012-08-22 16:21:46 -07:00
Roman Nurik
2b4b1afcfa am 6d672214: Merge "Update TabCompat training sample code download." into jb-dev 
* commit '6d672214ae04e7d8d239c322ec4c79f9ee1feea9':
  Update TabCompat training sample code download.
 2012-08-22 16:21:40 -07:00
Irfan Sheriff
86bb22584f Merge "Fix system server restart" into jb-dev 2012-08-22 16:12:30 -07:00
Jean-Baptiste Queru
0a72b3e12c ignore merge of 2e2849a5 to jb-dev-plus-aosp 
Change-Id: Ie13c209a6646a08107ffecc9e63610fd5b9fab55
 2012-08-22 15:36:27 -07:00
Katie McCormick
645eab640e Merge "Doc update: client javadoc fix for @value." into jb-dev 2012-08-22 14:33:27 -07:00
Arik Nemtsov
5770b2dcf6 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>
 2012-08-22 16:29:43 -05:00
Stephen Hines
7cb7292f04 am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '56c6392fefba53e72c9effb7b5c92c64e03ecfd5':
  DO NOT MERGE - Fix readback lengths
 2012-08-22 14:24:39 -07:00
Stephen Hines
56c6392fef am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '9f7fa4c4177c405566445760ec7f4c27e812cd7f':
  DO NOT MERGE - Fix readback lengths
 2012-08-22 14:23:01 -07:00
Stephen Hines
9f7fa4c417 Merge "DO NOT MERGE - Fix readback lengths" 2012-08-22 14:06:37 -07:00
Katie McCormick
c44ba477b3 Doc update: client javadoc fix for @value. 
Change-Id: I9e1327a21d0755fc10b4e5cb4aa9ecd30053b6ef
 2012-08-22 13:56:17 -07:00
Justin Ho
3bc03666cc am 72404a82: Merge "Update Back softkey icon Bug: 6020915" into jb-dev 
* commit '72404a82d30ff0631a31aed93f221c1fdf210888':
  Update Back softkey icon Bug: 6020915
 2012-08-22 12:58:09 -07:00
Roman Nurik
6d672214ae Merge "Update TabCompat training sample code download." into jb-dev 2012-08-22 12:30:46 -07:00
Wink Saville
2e2849a5e4 Merge "Empty DC's apnList when the DC is free." into jb-dev 2012-08-22 11:49:48 -07:00
Roman Nurik
5a45dd94d0 Update TabCompat training sample code download. 
Depends on If6face5a0548107f7fd273e466b1ced2790f4f3a

Change-Id: I06c13cd02ca791a57a374b3c4af4b46e68dacda4
 2012-08-22 11:28:07 -07:00
Irfan Sheriff
46b29d8dd5 am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer" 
* commit 'e5773274d68cf91cb9966f47c54ce69a7a6b03f4':
  WifiWatchdog: handle exception from ArpPeer
 2012-08-22 11:09:17 -07:00
Irfan Sheriff
c584a24ba1 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
 2012-08-22 11:01:03 -07:00
Irfan Sheriff
e5773274d6 Merge "WifiWatchdog: handle exception from ArpPeer" 2012-08-22 10:57:50 -07:00
Irfan Sheriff
2140d1de47 Merge "Avoid system_server crashing due to mac address is null" 2012-08-22 10:48:23 -07:00
Jean-Baptiste Queru
29c6f24b25 am 6ffe2594: Merge "restorecon /data/anr directory." 
* commit '6ffe2594674f250c16c5e3055aa69680efaa6f69':
  restorecon /data/anr directory.
 2012-08-22 07:46:41 -07:00
Jean-Baptiste Queru
6ffe259467 Merge "restorecon /data/anr directory." 2012-08-22 07:18:39 -07:00
Wink Saville
b44b13a3f5 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
 2012-08-21 22:58:54 -07:00
Chih-Wei Huang
21326d8b77 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
 2012-08-22 11:26:51 +08:00
Dianne Hackborn
8b97ee6d8c am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:39:42 -07:00
Justin Ho
72404a82d3 Merge "Update Back softkey icon Bug: 6020915" into jb-dev 2012-08-21 15:19:15 -07:00
Dianne Hackborn
b0b4a70440 Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 2012-08-21 15:12:45 -07:00
Justin Ho
962daf9b1c Update Back softkey icon 
Bug: 6020915

Change-Id: I780f09bd1e99a10b2189ab253dd1a082118a385d
 2012-08-21 14:21:29 -07:00
Jean-Baptiste Queru
34d8574665 am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()" 
* commit 'b8da225f26b689288710ff0eafefa906b4f5700f':
  Tests/RS: Add RS context check for RsBalls setAccel()
 2012-08-21 14:00:11 -07:00