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

80443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johan Redestig
7314532349 Make SimpleSessionDescription locale safe 
Explicitly use Locale.US in SimpleSessionDescription to avoid
unexpected results in some locales.

Change-Id: Idb4a36a9e332d302e1b9b940355917c0f738e076
 2012-08-29 08:21:05 +02:00
Johan Redestig
3cd42dfd50 Make addAddress locale safe 
Using regular string concatenation to avoid unexpected
results in some locales.

Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad
 2012-08-29 08:07:02 +02:00
Daniel Sandler
393e3170b3 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
 2012-08-28 13:19:52 -07:00
Jean-Baptiste Queru
1112a376e8 am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter" 
* commit '416362e6d8c8d0a34e09704138688f75aa810c9b':
  Change StringTokenizer to TextUtils.StringSplitter
 2012-08-28 13:19:48 -07:00
Daniel Sandler
ad955fe87f Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 2012-08-28 12:52:49 -07:00
Jean-Baptiste Queru
416362e6d8 Merge "Change StringTokenizer to TextUtils.StringSplitter" 2012-08-28 12:22:39 -07:00
Jean-Baptiste Queru
337756fa65 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.
 2012-08-28 11:08:22 -07:00
Jean-Baptiste Queru
78ad66b43c Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal." 2012-08-28 10:43:10 -07:00
Irfan Sheriff
129d6fac00 am 67ea8c86: Merge "Added a persistent feature in WiFi Direct." 
* commit '67ea8c86419ffbf603052e816d6b1e9e7e20fbb9':
  Added a persistent feature in WiFi Direct.
 2012-08-27 17:57:29 -07:00
Irfan Sheriff
67ea8c8641 Merge "Added a persistent feature in WiFi Direct." 2012-08-27 17:54:07 -07:00
The Android Open Source Project
e9c7efda14 Reconcile with jb-mr0-release jb-release - do not merge 
Change-Id: I0387880d7a374b53a5d0f58c7c2234a4ae3cf325
 2012-08-27 14:11:17 -07:00
Dianne Hackborn
aae4943297 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
 2012-08-27 12:33:57 -07:00
Dianne Hackborn
4763989d95 am 32d1fec5: Merge "Fixes relative time formatting issue for dates in future" 
* commit '32d1fec50baaecdea34ae2a47ca808e8e4181ed2':
  Fixes relative time formatting issue for dates in future
 2012-08-27 12:31:49 -07:00
Dianne Hackborn
32d1fec50b Merge "Fixes relative time formatting issue for dates in future" 2012-08-27 11:39:10 -07:00
Jean-Baptiste Queru
3221b33322 am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe" 
* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
  Make setCaptureRate locale safe
 2012-08-27 11:29:29 -07:00
Jean-Baptiste Queru
26ad1e7874 am 03d16e12: Merge "Make setCaptureRate locale safe" 
* commit '03d16e122aa01f9283836d1e5144428082b4c1cd':
  Make setCaptureRate locale safe
 2012-08-27 11:28:00 -07:00
Jean-Baptiste Queru
03d16e122a Merge "Make setCaptureRate locale safe" 2012-08-27 10:22:29 -07:00
Jean-Baptiste Queru
ba37d595f7 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
 2012-08-27 08:13:27 -07:00
Jean-Baptiste Queru
e70a32afc5 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
 2012-08-27 08:11:19 -07:00
Jean-Baptiste Queru
eb00f95143 Merge "VibratorService: Fix to ensure actual delay in a vibrate pattern" 2012-08-27 07:55:41 -07:00
Yoshihiko Ikenaga
0879d03f0a 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>
 2012-08-27 21:54:44 +09:00
Johan Redestig
1c7928e8c6 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
 2012-08-27 14:24:10 +02:00
Steve Pomeroy
ca3363775e 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>
 2012-08-27 02:20:13 -04:00
Dirk Dougherty
2f1ec0db61 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.
 2012-08-24 14:43:18 -07:00
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