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

80359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
862c383530 am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity." 
* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
  Added check of ActivityInfo launch mode when starting activity.
 2012-08-30 15:59:40 -07:00
Dianne Hackborn
4b60a8d1b8 Merge "Added check of ActivityInfo launch mode when starting activity." 2012-08-30 15:19:03 -07:00
Jean-Baptiste Queru
147ef94485 am 60d1e1a0: Merge "Watchdog: Improvement of debuggability" 
* commit '60d1e1a09e4603e24652e930597ab204855eaa77':
  Watchdog: Improvement of debuggability
 2012-08-30 13:49:58 -07:00
Jean-Baptiste Queru
60d1e1a09e Merge "Watchdog: Improvement of debuggability" 2012-08-30 13:32:10 -07:00
John Reck
da5cd30802 am ae03afda: Merge "onSavePassword dialog can leak when WebViewClassic is destroyed." 
* commit 'ae03afda41ace0721e48ed15ce35345bfa033116':
  onSavePassword dialog can leak when WebViewClassic is destroyed.
 2012-08-30 11:41:38 -07:00
John Reck
ae03afda41 Merge "onSavePassword dialog can leak when WebViewClassic is destroyed." 2012-08-30 11:00:22 -07:00
rikard dahlman
9211b13c32 Watchdog: Improvement of debuggability 
If the watchdog detects a problem the system server process
is killed, that is followed by a crash. Because the crash is
done after the system server process is killed, the crash
don't contain info about the system server.
This improvement will make sure that the system is crashed
before the system server process is killed.
Behavior is only changed for eng and userdebug builds.

Change-Id: I9f1c8fd8b03d0114032ed44fb582705ad0b49733
 2012-08-30 12:27:50 +02:00
Johan Redestig
8655e9085c onSavePassword dialog can leak when WebViewClassic is destroyed. 
The AlertDialog creates in onSavePassword method leaks if
WebViewClassic is destroyed when the dialog is shown.

Change-Id: I81f20e1dd138467a6413766c0a081b389b334ae0
 2012-08-30 10:13:41 +02:00
Jean-Baptiste Queru
4a4edbbfce am 7fecf5f4: Merge "Make addAddress locale safe" 
* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
  Make addAddress locale safe
 2012-08-29 12:59:06 -07:00
Jean-Baptiste Queru
7fecf5f451 Merge "Make addAddress locale safe" 2012-08-29 12:19:04 -07:00
Jean-Baptiste Queru
14c0c989d2 am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly" 
* commit '4ba4caede125ff602b0d93f577f9054a07791ff7':
  Fix SkBitmap::fPixels not being locked correctly
 2012-08-29 11:55:20 -07:00
Jean-Baptiste Queru
4ba4caede1 Merge "Fix SkBitmap::fPixels not being locked correctly" 2012-08-29 11:27:31 -07:00
Jean-Baptiste Queru
15e099cc09 am 0e0942c7: Merge "Default WiFi sleep policy setting" 
* commit '0e0942c7209c758bc00939ae54059dc24bce3abb':
  Default WiFi sleep policy setting
 2012-08-29 10:49:25 -07:00
Irfan Sheriff
c5f34bd40b am 48c45d0e: Merge "Fix join scenario with provision discovery" 
* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
  Fix join scenario with provision discovery
 2012-08-29 10:49:20 -07:00
Jean-Baptiste Queru
0e0942c720 Merge "Default WiFi sleep policy setting" 2012-08-29 09:50:45 -07:00
Irfan Sheriff
48c45d0e3b Merge "Fix join scenario with provision discovery" 2012-08-29 09:47:27 -07:00
Irfan Sheriff
127efc4e25 Fix join scenario with provision discovery 
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
 2012-08-29 08:36:17 -07:00
Michal Stawinski
35ef567140 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
 2012-08-29 15:54:01 +02:00
Erik Ljungberg
7e07147ece 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
 2012-08-29 09:52:12 +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