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

17691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjorn Bringert
60f1b95ef3 Merge "Update search source selector assets" 2010-01-29 09:23:05 -08:00
Suchi Amalapurapu
bd2f531a28 Merge "Fix StringIndexOutOfBoundsException in PackageManagerService" 2010-01-29 08:45:39 -08:00
Bjorn Bringert
aa0cfa7b6b Update search source selector assets 
Change-Id: Id56e2ac195e1d1f8dcfe2fbe07025f3527396bba
 2010-01-29 16:15:36 +00:00
Daniel Sandler
d425a45f8d Fix build. 
(Broken in change Ib94f795c.)
 2010-01-29 10:09:04 -05:00
San Mehat
b4a162e50a framework: os: Introduce IMountServiceObserver 
Signed-off-by: San Mehat <san@google.com>
 2010-01-29 06:30:03 -08:00
Daniel Sandler
77c292d83e Merge "New full-screen activity for USB mass storage interaction." 2010-01-29 06:22:33 -08:00
Bjorn Bringert
5fd5bfe942 Fix StringIndexOutOfBoundsException in PackageManagerService 
The method packageManagerService.getNextCodePath(String oldCodePath,
String prefix, String suffix) threw StringIndexOutOfBoundsException if
oldCodePath does not contain prefix, and prefix is longer than
oldCodePath, or if the preix and suffix overlap.

Fixes http://b/issue?id=2404232

Change-Id: Ib8abb16f8bfd08f607476d9289f46d170c43a076
 2010-01-29 12:29:41 +00:00
Chia-chi Yeh
784d53e79b WifiService: allow EAP variables to be unset using empty strings. 2010-01-29 16:26:28 +08:00
Adam Powell
a9938c4bf4 Merge "Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView." 2010-01-28 21:24:10 -08:00
Irfan Sheriff
05d72117f9 Handle error strings from monitor connection 
Bug: 2399119
Change-Id: I481cfbfb11fb453659134004aafa3df236ba050b
 2010-01-28 20:54:12 -08:00
Irfan Sheriff
c4a0c2744a Merge "Blacklist APs instead of disable" 2010-01-28 20:46:25 -08:00
Adam Powell
f54460576e Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView. 2010-01-28 17:25:29 -08:00
Tom Taylor
5e342fa326 Remove MMS from the framework 
The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.

Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
 2010-01-28 16:59:27 -08:00
Dirk Dougherty
1f40f174e7 am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 
Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a'

* commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
 2010-01-28 16:52:43 -08:00
Dirk Dougherty
b574cf876e am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp

* commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
 2010-01-28 16:46:54 -08:00
Dirk Dougherty
7b00a8ae71 Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 2010-01-28 16:40:56 -08:00
Dirk Dougherty
95b528eab5 SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features. 
Bug: 2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
 2010-01-28 16:26:50 -08:00
Jean-Baptiste Queru
d09f4aaba2 resolved conflicts for merge of bb074ef9 to master 
Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
 2010-01-28 15:21:25 -08:00
Dirk Dougherty
59e8fc5f53 am 67a65856: am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 
Merge commit '67a658567a6bad898c097e615f8efcb3c91fa50d'

* commit '67a658567a6bad898c097e615f8efcb3c91fa50d':
  doc change only: Update announcement and mwc redirect to point to microsite.
 2010-01-28 15:10:19 -08:00
Eric Laurent
3869986d68 Merge "Remove verbose log from AudioPolicyManagerBase." 2010-01-28 15:01:42 -08:00
Jim Miller
2e9dea1dbe am fbf977be: am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode. 
Merge commit 'fbf977be5471a81b664bfc0a048497f268688a17'

* commit 'fbf977be5471a81b664bfc0a048497f268688a17':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
 2010-01-28 14:57:03 -08:00
Robert Greenwalt
fbf56dc719 am 3e229076: am cc4b4016: Fix the reporting of NO_CONNECTIVITY. 
Merge commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c'

* commit '3e229076203cd8cfee0adac44cd3c930dfa0e59c':
  Fix the reporting of NO_CONNECTIVITY.
 2010-01-28 14:46:55 -08:00
Andreas Huber
8cc99938c3 Merge "Support the specification of additional HTTP headers in the creation of a DataSource." 2010-01-28 14:18:19 -08:00
Adam Powell
4d3cef348b Merge "ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller." 2010-01-28 14:03:15 -08:00
Jesse Wilson
1aa444b81f Merge "Fix the broken compile of a currently-not-being-compiled AWT class." 2010-01-28 14:00:48 -08:00
Adam Powell
3fc3737ceb ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller. 2010-01-28 13:52:24 -08:00
Robert Greenwalt
64fe5646c5 am 6d626d41: am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 
Merge commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0'

* commit '6d626d41e9db62a0eadb61ccb2aa4081a8b9f6d0':
  Refine fix I53e91db7 to apply only to wifi network
 2010-01-28 13:44:45 -08:00
Scott Main
e7d9ba249a am 9985feca: am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 
Merge commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174'

* commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174':
  docs: reference the history JS file with docRoot in order to
 2010-01-28 13:44:35 -08:00
Eric Laurent
f145108a68 Remove verbose log from AudioPolicyManagerBase. 2010-01-28 13:42:59 -08:00
Mike Reed
6e59483f18 am b2244690: (-s ours) am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 
Merge commit 'b22446901c477f40863132a9617368852d358f64'

* commit 'b22446901c477f40863132a9617368852d358f64':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
 2010-01-28 13:42:31 -08:00
Jean-Baptiste Queru
1ad05dcbf5 Merge "resolved conflicts for merge of 33ca1f32 to master" 2010-01-28 13:19:56 -08:00
Daniel Sandler
b94f795c25 New full-screen activity for USB mass storage interaction. 
Still TODO: patch into forthcoming callbacks from
MountService so the USB storage activity always shows the
correct state of the device. (Right now it only refreshes
its display onResume.)

Bug: 2299129
 2010-01-28 16:18:22 -05:00
Kenny Root
e096ddee54 resolved conflicts for merge of 33ca1f32 to master 
Change-Id: If5344c23c4fd727c0ad684859126337de6ca1d9f
 2010-01-28 13:16:19 -08:00
Dianne Hackborn
254cb446fa More device admin. 
- Clean up device policy manager APIs.
- Implement lockNow().  For now this just turns the screen off to lock the device.
 2010-01-28 13:15:57 -08:00
Andreas Huber
433c9acaf7 Support the specification of additional HTTP headers in the creation of a DataSource. 
related-to-bug: 2393577
 2010-01-28 13:04:28 -08:00
Andreas Huber
2fd75f3515 Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played." 2010-01-28 12:56:17 -08:00
Dirk Dougherty
57853a8aec am 99988b6e: am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a'

* commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a':
  SDK doc change: Misc small fixes.
 2010-01-28 12:37:21 -08:00
Dirk Dougherty
cf5769877b am 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 
Merge commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8'

* commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
 2010-01-28 12:37:10 -08:00
Brian Carlstrom
2c36081131 Merge "Issue 1597: browser crash possibly related to invalid SSL certificate" 2010-01-28 12:33:27 -08:00
Jesse Wilson
a89815e6a5 Fix the broken compile of a currently-not-being-compiled AWT class. 
I intend to remove AWT entirely, but doing so is a large project and
this stopgap will remove several errors from Eclipse projects.
 2010-01-28 12:31:01 -08:00
Kenny Root
bdbc925a27 resolved conflicts for merge of b0903104 to master 
Change-Id: Iff20980c44d42b41ae411c4201e0927cee19d415
 2010-01-28 12:03:49 -08:00
Andreas Huber
2564300936 API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played. 
related-to-bug: 2393577

Original change by Andrei Popescu <andreip@google.com>
 2010-01-28 11:52:43 -08:00
Irfan Sheriff
0049a1bf3f Blacklist APs instead of disable 
We currently disable networks upon too many reconnects. This leads to asking
the user input for reconnects. Blacklist it instead.

Bug: 2129037
Change-Id: I23d69daf3964c066ed7f70d32fefb81016f19aa2
 2010-01-28 11:27:14 -08:00
Brian Carlstrom
6505122dfe Issue 1597: browser crash possibly related to invalid SSL certificate 2010-01-28 11:17:43 -08:00
Dirk Dougherty
5f551ef6a8 am 97ca28cd: am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 
Merge commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9'

* commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9':
  doc change: add announce for developer lab at mwc. move adc to carousel.
 2010-01-28 10:48:15 -08:00
John Wang
5bb3371823 am 89fec7b1: am 098295a5: Merge "Updated emergency string when locale changes." into eclair 
Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59'

* commit '89fec7b155981d6e99eb1e05793f343a5d04aa59':
  Updated emergency string when locale changes.
 2010-01-28 10:47:27 -08:00
Grace Kloba
f95a61746e am 4f01c927: (-s ours) am 5ff24d5d: DO NOT MERGE 
Merge commit '4f01c927503401d560cb4f209b7d9a723c32e8cb'

* commit '4f01c927503401d560cb4f209b7d9a723c32e8cb':
  DO NOT MERGE
 2010-01-28 10:47:15 -08:00
Eric Laurent
f1a0f55f71 am 131c5e08: am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair 
Merge commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391'

* commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391':
  Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
 2010-01-28 10:09:09 -08:00
John Wang
70aaacac82 am 64c92f75: am 08cb0024: Handle emergency calls only status in ServiceStateTracker. 
Merge commit '64c92f75df7415084aa9f0b304f2a99089b6be9f'

* commit '64c92f75df7415084aa9f0b304f2a99089b6be9f':
  Handle emergency calls only status in ServiceStateTracker.
 2010-01-28 10:08:55 -08:00
Grace Kloba
6790918497 Use a single EXTRA_HEADERS intent. 2010-01-28 09:19:10 -08:00