Jim Miller ecaced9a78 Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3 ...

Fix 2575838: Update emergency button in AccountUnlockScreen DO NOT MERGE

AccountUnlockScreen wasn't registered to receive updates from
UpdateMonitor. It now correctly updates the Emergency call button
to allow the user to return to the call in progress (InCallScreen).

Tested on WVGA device with keyboard:
- hitting Home during call, observing state, and pressing button to return to call.
- hitting Home while not in call to ensure it still invokes EmergencyDialer.
- above in various keyboard states.

Change-Id: Ic4480ff69ff4479557ddb7f76c751b005b1c60bf

2010-04-15 17:39:17 -07:00

api

am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo

2010-04-12 15:16:07 -07:00

awt

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

build

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

camera

Still do dump() if we cannot get mServiceLock for a while.

2010-03-05 15:21:02 -08:00

cmds

am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." in

2010-04-13 12:23:28 -07:00

common

Move the public method HttpDateTime.parse() into AndroidHttpClient.

2010-04-09 13:34:15 -07:00

core

Merge "Missing resources for lock screen." into kraken

2010-04-14 12:15:04 -07:00

data

final versions of these fonts from ascender, including GPOS 'mark' feature

2010-04-09 15:12:19 -04:00

docs

Merge "SDK: more backup/restore documentation work" into froyo

2010-04-12 16:14:53 -07:00

graphics

don't hardcode "mSurface" throughout our source code

2010-04-12 16:29:36 -07:00

include

Merge "don't hardcode "mSurface" throughout our source code" into kraken

2010-04-12 18:59:49 -07:00

keystore

Don't rely on the system locale for converting to/from bytes.

2010-03-10 11:25:53 -08:00

libs

am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.

2010-04-10 11:48:24 -07:00

location

Move files internal to LocationManagerService from framework.jar to services.jar

2010-04-04 18:44:05 -04:00

media

am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.

2010-04-14 12:15:18 -07:00

native

Move the NDK graphics wrapper (libjnigraphics) to frameworks/base/native

2010-02-04 15:31:19 -08:00

obex

Add ABORT support to Obex lib

2010-03-16 09:59:06 -07:00

opengl

small cleanup. gEGLImpl should have been static

2010-04-09 14:26:07 -07:00

packages

am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo

2010-04-13 11:54:04 -07:00

policy

Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3

2010-04-15 17:39:17 -07:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo

2010-04-14 12:11:17 -07:00

telephony

Fix a FATAL ClassCastException in DataConnection.java

2010-04-09 08:57:31 -07:00

test-runner

Package manager optimizations.

2010-03-30 13:34:43 -07:00

tests

am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo

2010-04-08 16:45:16 -07:00

tools

Adds back the finalize method on the replaced Paint class.

2010-04-08 17:18:35 -07:00

vpn

DO NOT MERGE

2010-03-29 18:12:24 -07:00

wifi/java/android/net/wifi

Fix WakeLock issue for driver stop

2010-03-24 17:59:42 -07:00

Android.mk

Add service to monitor/control the flow of data.

2010-04-08 12:34:45 -07:00

CleanSpec.mk

Finish moving the policies out of frameworks/policies/base and into frameworks/base.

2010-04-06 20:21:30 -05:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

Start using CLDR for some date-and-time strings and formats.

2009-05-15 10:15:50 -07:00

preloaded-classes

am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo

2010-04-10 11:47:45 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%