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

5588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Git Automerger
ce41050023 resolved conflicts for merge of 4d4229e4 to master 2009-07-29 16:42:09 -07:00
Joe Onorato
e712ee3fe1 Take ctate's suggestions from 9008. 2009-07-29 16:23:58 -07:00
Android (Google) Code Review
bbdf3cafe9 am 67897b1a: (-s ours) Merge change 8884 into donut 
Merge commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d'

* commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d':
  DO NOT MERGE. Already in master. Fix calendar test.
 2009-07-29 14:47:50 -07:00
Android (Google) Code Review
b2b28f3122 am 1521cd6e: Merge change 8015 into donut 
Merge commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead'

* commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead':
  Reset the mDpiX and mDpiY values when qemu.sf.lcd_density is defined.
 2009-07-29 14:47:41 -07:00
Android (Google) Code Review
afa7d85b43 Merge change 9008 
* changes:
  Only restore the bits for wallpapers that aren't built in.
 2009-07-29 14:10:12 -07:00
Android (Google) Code Review
1c3f760dcd Merge change 9004 
* changes:
  Fix NullPointerException when checking if its a sinkDevice.
 2009-07-29 13:57:41 -07:00
Android (Google) Code Review
e4162b2129 Merge change 9011 
* changes:
  Allow zero-length lists in EventLog entries.   (I'm verifying that the consumers of EventLog -- logcat, checkin -- are OK with this.) Improve the error handling in RestoreSession.
 2009-07-29 13:23:24 -07:00
Dan Egnor
0084da561e Allow zero-length lists in EventLog entries. 
(I'm verifying that the consumers of EventLog -- logcat, checkin -- are OK with this.)
Improve the error handling in RestoreSession.
 2009-07-29 12:57:16 -07:00
Jesse Wilson
ff1907f60a Updating API XML for the java.util.concurrent update. 2009-07-29 12:06:13 -07:00
Joe Onorato
9bb8fd77c8 Only restore the bits for wallpapers that aren't built in. 2009-07-29 12:05:36 -07:00
Jaikumar Ganesh
0ba3cfaa56 Fix NullPointerException when checking if its a sinkDevice. 2009-07-29 11:43:25 -07:00
Android (Google) Code Review
8b6a3807f1 Merge change 8997 
* changes:
  GLESv2 couldn't be loaded due to wrong path specification
 2009-07-29 11:11:13 -07:00
Mathias Agopian
c902bf8f13 GLESv2 couldn't be loaded due to wrong path specification 2009-07-29 11:10:29 -07:00
Jesse Wilson
de5dc2bba9 New current.xml to correspond to the util.concurrent updates. 2009-07-29 10:49:10 -07:00
Android (Google) Code Review
4ed9d78754 Merge change 4768 
* changes:
  Implement sliding window sync.
 2009-07-29 10:18:30 -07:00
Android (Google) Code Review
d058ee0198 Merge change 8987 
* changes:
  Fix firestone build
 2009-07-29 09:50:29 -07:00
Marco Nelissen
ee028d5771 Fix firestone build 2009-07-29 09:47:23 -07:00
Android (Google) Code Review
a5d7b1b7f7 am 159e1a9a: Merge change 8883 into donut 
Merge commit '159e1a9a13ccfa4d99941e21068994366e2bbc7b'

* commit '159e1a9a13ccfa4d99941e21068994366e2bbc7b':
  fix [1973755] Surface.SURACE_FROZEN spelled SURACE_FROZEN
 2009-07-29 09:46:38 -07:00
Android (Google) Code Review
2ec556ddc8 Merge change 8984 
* changes:
  Fix issue 2019031: Volume changes have no effect.
 2009-07-29 09:37:14 -07:00
Steve Block
4faee09c42 Adds the Java side of the system to show the Geolocation permissions prompt. 2009-07-29 17:02:37 +01:00
Eric Laurent
c42ac9d4d0 Fix issue 2019031: Volume changes have no effect. 
Send initStreamVolume() for each stream when media server restarts.
Also added restoring of phone state, device connection state and forced device for communications.
 2009-07-29 08:53:03 -07:00
Steve Block
0ac031b3d2 Adds the Java GeolocationPermissions class. 
This is used by the Browser 'Website Settings' menu to get information about Geolocation permissions.
 2009-07-29 16:03:53 +01:00
Andrei Popescu
59e2ad93bf Wire in the AppCache out-of-space callback 2009-07-29 11:07:44 +01:00
Android (Google) Code Review
c6c18133b3 Merge change 8764 
* changes:
  allow illegal subparam sizes for CDMA SMS
 2009-07-28 23:34:11 -07:00
Tammo Spalink
f62a2bf29a allow illegal subparam sizes for CDMA SMS 
addresses http://buganizer/issue?id=2008358
 2009-07-29 14:31:43 +08:00
Android (Google) Code Review
43e08e34cf Merge change 8945 
* changes:
  Expose type constants and accessor for unit tests.
 2009-07-28 20:46:22 -07:00
Jeff Sharkey
bc25407b92 Expose type constants and accessor for unit tests. 
Internally, ContentProviderOperation maintains a "type",
which correspond to builder methods, such as "newInsert()".

Unit tests often need to assert which operations are
being built, so this change adds a getType() accessor and
esposes the internal constants used.  They are marked with
@hide so they are not exposed in the public API.
 2009-07-28 20:39:35 -07:00
Android (Google) Code Review
700a52ac7a Merge changes 8935,8936 
* changes:
  Fix the IOException in wallpaper restore -- the padding isn't required at the end.
  Fix bug 1982892 - batteryservice turns off device even while plugged in
 2009-07-28 20:20:02 -07:00
Android (Google) Code Review
e1c00aab87 Merge change 8931 
* changes:
  fix [1985856] Seg fault when using the soft keyboard in the Messaging app
 2009-07-28 19:18:32 -07:00
Mathias Agopian
c915d0a33c fix [1985856] Seg fault when using the soft keyboard in the Messaging app 2009-07-28 19:17:54 -07:00
Android (Google) Code Review
4d4229e4d9 Merge change 8757 into donut 
* changes:
  Support x509-user-cert mime type in browser.
 2009-07-28 18:34:33 -07:00
Android (Google) Code Review
103209189c Merge change 8922 
* changes:
  GPS: Don't call native_set_agps_server() until after we call native_init().
 2009-07-28 18:34:28 -07:00
Mike Lockwood
734d6031a6 GPS: Don't call native_set_agps_server() until after we call native_init(). 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-07-28 18:33:41 -07:00
Joe Onorato
8d72569e3b Fix the IOException in wallpaper restore -- the padding isn't required at the end. 2009-07-28 18:30:15 -07:00
Joe Onorato
a7e4cf9b5c Fix bug 1982892 - batteryservice turns off device even while plugged in 
Also, make the battery service do it, not some keyguard thing.
 2009-07-28 18:30:15 -07:00
Android (Google) Code Review
f256c4001b am a62f16ac: Merge change 8877 into donut 
Merge commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0'

* commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0':
  Remove warning in non-eng builds.
 2009-07-28 17:57:39 -07:00
Android (Google) Code Review
bfefdcda94 Merge change 8886 
* changes:
  Fix broken calendar tests.
 2009-07-28 17:42:53 -07:00
Android (Google) Code Review
3eb4344878 Merge change 8901 
* changes:
  Add new icons and implement text. Fix bug with uploading 8888 bitmaps of non-square size.
 2009-07-28 17:22:23 -07:00
Jason Sams
6f5c61c8df Add new icons and implement text. Fix bug with uploading 8888 bitmaps of non-square size. 2009-07-28 17:20:11 -07:00
Android (Google) Code Review
ec5d683335 Merge change 8839 
* changes:
  Fix selection and change icon loading from 565 to 8888.
 2009-07-28 17:19:00 -07:00
Android (Google) Code Review
3635c0d378 Merge change 8888 
* changes:
  Voicemail number setting is throwing exception
 2009-07-28 16:32:04 -07:00
Android (Google) Code Review
67897b1af7 Merge change 8884 into donut 
* changes:
  DO NOT MERGE. Already in master. Fix calendar test.
 2009-07-28 16:28:42 -07:00
Android (Google) Code Review
e406906e16 Merge change 8878 
* changes:
  Support for selection of silent ringtone from the ringtone picker. This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
 2009-07-28 16:26:40 -07:00
Ken Shirriff
04cc0e121f Fix broken calendar tests. 
The tests end up in the widget code, which calls getResources().  This needs to
be supported by the mock.

bug=1985641
 2009-07-28 16:20:48 -07:00
Android (Google) Code Review
1521cd6e65 Merge change 8015 into donut 
* changes:
  Reset the mDpiX and mDpiY values when qemu.sf.lcd_density is defined.
 2009-07-28 16:16:38 -07:00
Android (Google) Code Review
159e1a9a13 Merge change 8883 into donut 
* changes:
  fix [1973755] Surface.SURACE_FROZEN spelled SURACE_FROZEN
 2009-07-28 16:12:58 -07:00
Marco Nelissen
69f593ccb7 Support for selection of silent ringtone from the ringtone picker. 
This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
 2009-07-28 16:06:38 -07:00
Mathias Agopian
c87c4a3e3b fix [1973755] Surface.SURACE_FROZEN spelled SURACE_FROZEN 2009-07-28 15:59:52 -07:00
Ken Shirriff
0f2e6663d9 DO NOT MERGE. Already in master. Fix calendar test. 
Test was failing because SSL caching calls getFileDir() which wasn't implemented in the mock.

bug=1966269
 2009-07-28 15:57:50 -07:00
Mathias Agopian
a0d128c8c6 resolved conflicts for merge of de36313b to master 2009-07-28 15:42:53 -07:00