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

55941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
f1eaf7f439 Merge "Fix 5045008: replace "ring/silence" target in LockScreen with camera app" 2011-08-04 18:06:03 -07:00
Jim Miller
be8d1cf1ac Fix 5045008: replace "ring/silence" target in LockScreen with camera app 
This change replaces the ring/silence target with a camera target.  It
is disabled and falls back to the old behavior when any device policy
disables the camera.

Updated with latest icons.

Change-Id: I2374eba08f85ff1d1b0bad2859efa30bb166fb60
 2011-08-04 18:00:14 -07:00
Jeff Sharkey
61d7cd460c Merge "Data cycle ends on last second of month." 2011-08-04 17:33:19 -07:00
Jeff Sharkey
af82ea2abf Data cycle ends on last second of month. 
When data cycle resets on a day invalid in given month, snap the
cycle to last second of month.  Previous behavior was to bump fully
into next month, but that causes cycle loops.

Includes tests to verify.

Bug: 4623124
Change-Id: I2f233091f6f1df33a2814284519cbc04532874e9
 2011-08-04 17:07:08 -07:00
Gloria Wang
803b192ea2 Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079." 2011-08-04 16:32:10 -07:00
Gloria Wang
1467ec3433 Close the DRM session in the destructor of ChromiumHTTPDataSource. 
Fix for bug 5015079.

Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
 2011-08-04 16:01:35 -07:00
Chet Haase
163efc0285 Merge "Fix AnimatorSet cancellation issues" 2011-08-04 15:47:21 -07:00
Jeff Sharkey
fe313490fb Merge "Network stats with varint, omit parcel fields." 2011-08-04 15:39:24 -07:00
Steve Block
d6a89b48c9 am 03f8fcb8: (-s ours) am c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge] 
* commit '03f8fcb8b017556df08d9926f8ca41b383c5ad08':
  Cherry-pick DeviceMotionService CL from master [do not merge]
 2011-08-04 15:36:04 -07:00
Irfan Sheriff
d6d0628051 Merge "Rewrote DnsPinger - now is async and concurrant" 2011-08-04 15:34:47 -07:00
Gloria Wang
188d661d93 Merge "resolved conflicts for merge of 845fdba7 to master" 2011-08-04 15:33:12 -07:00
Andreas Huber
a9307bef53 Merge "Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer" 2011-08-04 15:20:24 -07:00
Gloria Wang
09337a07fa resolved conflicts for merge of 845fdba7 to master 
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
 2011-08-04 15:13:14 -07:00
Andreas Huber
e38a2cba16 Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer 
Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug: 5122973
 2011-08-04 15:05:17 -07:00
Steve Block
03f8fcb8b0 am c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge] 
* commit 'c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
  Cherry-pick DeviceMotionService CL from master [do not merge]
 2011-08-04 14:49:44 -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
Chet Haase
b8f574a165 Fix AnimatorSet cancellation issues 
AnimatorSet was incorrectly ignoring cancel() when it was in the
initial startDelay phase. Fix is to change isRunning() to be true if the
animator is also in its delay phase.

Change-Id: I1a8c877de24fa294beea0ba30d495658255b13b3
 2011-08-04 14:16:48 -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
Steve Block
c4d93ba55f Cherry-pick DeviceMotionService CL from master [do not merge] 
In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering.

cherry-pick of Change: d09001fea476ca6c6eaff5e29a1bb6f3aebe5bd5

Bug: 5110230
Change-Id: Id1d1f51b445ce4a14bfcdfad8f173922e01b6563
 2011-08-04 10:59:59 -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
Isaac Levy
d2fe04b71a Rewrote DnsPinger - now is async and concurrant 
Change-Id: I93e1374ae857832935202614e34ce18f040fcfc7
 2011-08-04 10:35:29 -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