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

55923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
09337a07fa resolved conflicts for merge of 845fdba7 to master 
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
 2011-08-04 15:13:14 -07:00
Gloria Wang
845fdba7b5 am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
  Bug fixes in OMA DRM v1 Forward Lock Agent
 2011-08-04 14:47:43 -07:00
Gloria Wang
8a6fb50d69 am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 
* commit '4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
  Bug fixes in OMA DRM v1 Forward Lock Agent
 2011-08-04 14:36:45 -07:00
Gloria Wang
4e197ea8a6 am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 
* commit 'e15a73ee4c9a28d89888095c7649a70c116ee160':
  Bug fixes in OMA DRM v1 Forward Lock Agent
 2011-08-04 14:33:06 -07:00
Gloria Wang
e15a73ee4c Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 2011-08-04 14:20:53 -07:00
Jean-Michel Trivi
e83af902c4 Merge "Remove empty remote control client listener methods" 2011-08-04 14:10:57 -07:00
Adam Powell
b491877331 Merge "Fix bug 5121406 - ActionBar.setLogo" 2011-08-04 13:21:07 -07:00
Adam Powell
29764eab44 Fix bug 5121406 - ActionBar.setLogo 
Make the resource ID version of setLogo work.

Change-Id: I0a710b714c9fd10bc3063a8ec95e59391ba4d4e0
 2011-08-04 13:12:01 -07:00
Chia-chi Yeh
b234636105 Merge "VPN: move away from the VPN permission." 2011-08-04 13:04:51 -07:00
Andreas Huber
e30d6f1588 Merge "Restart HLS streaming from the bottom of the playlist if we miss the boat on the" 2011-08-04 12:57:45 -07:00
Xavier Ducrohet
14434ed6e7 am 23ce76ce: am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit '23ce76ce1666e5e8b0b17825c271b133ba2626d6':
  Insert a break wraparound.
 2011-08-04 12:56:46 -07:00
Xavier Ducrohet
23ce76ce16 am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit '320834c9e02364b39b98b610f1d2244cbb9a4f26':
  Insert a break wraparound.
 2011-08-04 12:54:49 -07:00
Xavier Ducrohet
320834c9e0 am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit 'b9e8b25e9066d6f2da0635eaac524246b729fbfa':
  Insert a break wraparound.
 2011-08-04 12:52:34 -07:00
Xavier Ducrohet
b9e8b25e90 am 6b3a0123: Merge "Insert a break wraparound." 
* commit '6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
  Insert a break wraparound.
 2011-08-04 12:50:11 -07:00
Xavier Ducrohet
6b3a012348 Merge "Insert a break wraparound." 2011-08-04 12:36:11 -07:00
Xavier Ducrohet
b7ef4cb254 Merge "Layoutlib: implement Resources.getBoolean(int)." 2011-08-04 12:18:17 -07:00
Andreas Huber
323e31754c Restart HLS streaming from the bottom of the playlist if we miss the boat on the 
next segment. This can happen if for whatever reason we playback video slower than
it is served.

Also removed some unnecessary verbosity from ChromiumHTTPDataSource.

Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79
related-to-bug: 5120425
 2011-08-04 12:10:29 -07:00
Adam Powell
0a2a287987 Merge "Fix bug 5073637 - Market apps crashing FastScroller" 2011-08-04 10:51:57 -07:00
Adam Powell
568ccd88d7 Fix bug 5073637 - Market apps crashing FastScroller 
It seems that some popular Market apps do not properly implement
SectionIndexer#getSectionForPosition and the framework did not
previously call it. Revert to more simplistic scrollbar behavior for
apps targeting sdk < Honeycomb.

Change-Id: If0b1f2b4db540de4bb8ba45798e498c09cddb42f
 2011-08-04 10:36:37 -07:00
Irfan Sheriff
aead35a850 Merge "Fix p2p package paths" 2011-08-04 10:29:23 -07:00
Jean-Michel Trivi
a30a21cf2e Remove empty remote control client listener methods 
Remove non-implemented methods for registering IRemoteControlClient
 listeners.

Rename refreshRemoteControlDisplay() method to follow framework
 conventions.

Change-Id: I9254e8eeea9020a530c9a32f328f0ef7dbd9dd0c
 2011-08-04 10:28:07 -07:00
Fabrice Di Meglio
e0511bf055 Merge "Fix bug #5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR" 2011-08-04 10:09:24 -07:00
Daniel Sandler
d3ffa270e0 Merge "Log some signal condition diagnostics for now." 2011-08-04 09:56:53 -07:00
Daniel Sandler
e0018cc790 Merge "Crushing Dreams." 2011-08-04 09:46:45 -07:00
Mike Lockwood
f9430aba1a Merge "Resolve merge conflict for '75f1fdec':" 2011-08-04 09:46:09 -07:00
Russell Brenner
adc25267f8 Merge "Adapt TextLayoutCache for new Harfbuzz scripts" 2011-08-04 09:41:53 -07:00
Debashish Chatterjee
fd827ed24a Merge "Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base." 2011-08-04 09:34:25 -07:00
Daniel Sandler
f91f0905e4 Merge "Fix NPE on first-ever boot if display has rotated." 2011-08-04 08:46:20 -07:00
Daniel Sandler
8d77e7714b Merge "Restore DISABLE_NOTIFICATION_ICONS." 2011-08-04 08:44:51 -07:00
Mike Lockwood
2b15cb21b3 Resolve merge conflict for '75f1fdec': 
GPS Provider Service changes

    GPS engine needs to receive network state changes from Android fw.

    Added db query for the current APN, also added a new parameter
    between JNI / HAL to the new method in AGpsRilInterface struct
    for gps engine to receive APN from GPSLocationService

Conflicts:
	services/java/com/android/server/location/GpsLocationProvider.java

Change-Id: I33c45027f1571493d3525324f62d199517c4960c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-08-04 11:40:25 -04:00
Mike Lockwood
75f1fdec3e am 0b3af353: am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit '0b3af353dcf61177158934a11404cf2914038696':
  GPS Provider Service changes
 2011-08-04 07:53:53 -07:00
Mike Lockwood
0b3af353dc am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit 'a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
  GPS Provider Service changes
 2011-08-04 07:51:38 -07:00
Debashish Chatterjee
e53eba0470 Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base. 
This permission has now been replaced by ADD_VOICEMAIL.

Bug: 5098551
Change-Id: Idc993f1674a66f0df3ec699ed14b2e5cfedfe3e8
 2011-08-04 15:49:04 +01:00
Mike Lockwood
a82ee49a7b am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
  GPS Provider Service changes
 2011-08-04 07:48:57 -07:00
Mike Lockwood
8f5dd9ad3f Merge "GPS Provider Service changes" 2011-08-04 07:39:03 -07:00
Kevin Tang
a5fe6b2efe GPS Provider Service changes 
GPS engine needs to receive network state changes from Android fw.

Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService

Change-Id: I62e35c948d2ac1961771d1a10581a3b8e695c05a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-08-04 10:33:35 -04:00
Svetoslav Ganov
7abaecc3db Merge "Removing firing of spurious scroll accesibility events." 2011-08-04 05:55:46 -07:00
Svetoslav Ganov
2c44b9221b Merge "No selection or click accessibility events are fired when a list item is tapped." 2011-08-04 05:55:26 -07:00
Henrik B Andersson
93827fb09e Bug fixes in OMA DRM v1 Forward Lock Agent 
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.

Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
 2011-08-04 13:43:02 +02:00
Wu-cheng Li
09f6d67f37 Merge "Add camera bayer image format." 2011-08-04 01:46:56 -07:00
Wu-cheng Li
70fb908504 Add camera bayer image format. 
The API are hidden.

bug:5086073

Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
 2011-08-04 16:40:28 +08:00
Irfan Sheriff
f6d09845be Fix p2p package paths 
Split change Iba3beb8c which will not go in master to fix package paths

Bug: 5002384
Change-Id: I15072b65422fcdfe17c3f130d169258d60748012
 2011-08-03 23:21:02 -07:00
Jim Miller
cf27a3ecc6 Merge "Fix 5044158: layout and asset work on lockscreen PIN mode" 2011-08-03 19:41:45 -07:00
Fabrice Di Meglio
6850c7aff5 Fix bug #5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR 
- add missing case for Arabic numbers

Change-Id: I7efe8172efee410eaafddec4a1465c1aa93a125b
 2011-08-03 19:13:34 -07:00
Dianne Hackborn
21351d1b44 Merge "Whoops also need to move notification shade above lock screen." 2011-08-03 18:58:04 -07:00
Dianne Hackborn
e8ecde10b3 Whoops also need to move notification shade above lock screen. 
And this requires making a new layer for the volume toast.

Change-Id: I4f272d56c87cf3b6bf886774b0fb02e610ab9164
 2011-08-03 18:55:50 -07:00
Daniel Sandler
96f3b6f010 Fix NPE on first-ever boot if display has rotated. 
Bug: 5116154
Change-Id: I8c91fa9eae24c6cb25f4431da00dc4b527124ae3
 2011-08-03 21:45:28 -04:00
Mike Lockwood
5564334aa5 Merge "UsbDeviceManager: Fix typo that broke adb on/off setting persistence" 2011-08-03 18:35:33 -07:00
Mike Lockwood
e2e7b1e2dc Merge "Add support for localizing order of day of week and date in status bar date view" 2011-08-03 18:35:23 -07:00
Daniel Sandler
60b3e9c157 Log some signal condition diagnostics for now. 
Bug: 5103241
Change-Id: Id780a3e535270c53e5f1b531c761ca5010291040
 2011-08-03 21:26:03 -04:00