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

80380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
3f3ce8adc7 am bf3e62b8: Merge "Make SimpleSessionDescription locale safe" 
* commit 'bf3e62b8913fc2fb88d6bb454a6491424cbd40c5':
  Make SimpleSessionDescription locale safe
 2012-09-06 11:47:29 -07:00
Jean-Baptiste Queru
bf3e62b891 Merge "Make SimpleSessionDescription locale safe" 2012-09-06 11:22:29 -07:00
Jean-Baptiste Queru
4aa83ec3ee am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage." 
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.
 2012-09-06 09:12:17 -07:00
Jean-Baptiste Queru
bb60bc2602 Merge "Musicplayer application can not display DRM files of internal storage." 2012-09-06 07:21:00 -07:00
Jean-Baptiste Queru
5409955555 am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client" 
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client
 2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47 am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable" 
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable
 2012-09-05 12:10:44 -07:00
Jean-Baptiste Queru
380a8e3d12 Merge "Am: Clean mLaunchingProviders of all providers started by the client" 2012-09-05 11:40:30 -07:00
Jean-Baptiste Queru
1ca2fee954 Merge "Make default value of auto-sync in SyncStorageEngine configurable" 2012-09-05 11:03:13 -07:00
Jean-Baptiste Queru
9eb3bd88f1 am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability"" 
* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
  Revert "Watchdog: Improvement of debuggability"
 2012-09-05 11:01:25 -07:00
Jean-Baptiste Queru
42a58ecd27 Merge "Revert "Watchdog: Improvement of debuggability"" 2012-09-05 10:55:43 -07:00
Jean-Baptiste Queru
784827b27c Revert "Watchdog: Improvement of debuggability" 
This reverts commit 9211b13c3268035b0da0c51ed2d6d5a578d45ff3.
 2012-09-04 13:35:12 -07:00
Jean-Baptiste Queru
d3b74b9124 am b307ceb4: Merge "SearchWidget: passing APP_DATA to voice intent" 
* commit 'b307ceb43fa96e8d54851c20278a4344469c9269':
  SearchWidget: passing APP_DATA to voice intent
 2012-09-04 11:38:28 -07:00
Jean-Baptiste Queru
b307ceb43f Merge "SearchWidget: passing APP_DATA to voice intent" 2012-09-04 10:49:48 -07:00
Vairavan Srinivasan
4ee364982e Am: Clean mLaunchingProviders of all providers started by the client 
Launching providers is removed from mLaunchingProviders when the client
process dies and works as long as the client process had requested just
one provider and not otherwise. Fix is to make sure mLaunchingProviders
is updated to remove all providers launched by the client process.

Change-Id: Ib4b8b44b6a102762a6558f65fb2e6dbf11d725ea
 2012-09-03 17:09:58 -07:00
Yameng Huang
2b5d0ea5e9 Make default value of auto-sync in SyncStorageEngine configurable 
This will make the default value of the automatic synchronization
in the SyncStorageEngine configurable with overlays for use by
vendors who want or have legal requirements to have the synchronization
off by default.

Change-Id: Iabdb355c4a1169fe8e254e91c43e162c5913d5e0
 2012-09-03 12:49:31 +02:00
Jorge Ruesga
1bcfe84179 SearchWidget: passing APP_DATA to voice intent 
SearchView uses SearchManager.APP_DATA to pass data between the origin activity
and the search activity. This works for text searches (keyboard), but it's not
implemented by voice recognition searches. The method createVoiceAppSearchIntent
initializes a empty bundle that is filled with the QUERY parameter.
This patch adds the SearchManager.APP_DATA parameter if is present, let the
search activity access to the data passed by the origin activity

Patch 2: Fix code style

Change-Id: I52dce34e1efd07a30ad74d52bfc60fbae1c4310b
 2012-09-03 01:26:59 +02:00
Jan Bjernler
20c38ea9fd Musicplayer application can not display DRM files of internal storage. 
Make DRM-protected files transferred over MTP be detected.
Previously it was inserted into the database as MEDIA_TYPE_NONE,
the result of this was that the file was not detected properly.
With this fix the file is scanned from the beginning.

Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
 2012-08-31 11:51:38 +02:00
Wink Saville
f5311768e3 am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit '0dab1a198e19c9993897b031d425a61a3bfec562':
  Fix code problem in writePidDns
 2012-08-30 18:11:30 -07:00
Wink Saville
0dab1a198e Merge "Fix code problem in writePidDns" 2012-08-30 17:36:06 -07:00
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
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