Commit Graph

27050 Commits

Author SHA1 Message Date
Irfan Sheriff
d23329df87 am df59f257: Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread
Merge commit 'df59f257583730470085db65c7faf44960c3b32e' into gingerbread-plus-aosp

* commit 'df59f257583730470085db65c7faf44960c3b32e':
  DO NOT MERGE Enable debug in StatusBarService
2010-09-20 20:02:32 -07:00
Irfan Sheriff
df59f25758 Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 2010-09-20 19:51:39 -07:00
Irfan Sheriff
2c9188e2c9 DO NOT MERGE Enable debug in StatusBarService
This is a temporary enable to allow us to identify
the issue with multiple icons on StatusBar

Bug: 2984213
Change-Id: I36ac7baff6544c63fa44d9b2c7453bca6a33bd62
2010-09-20 18:10:17 -07:00
Mike Lockwood
24956d36f4 am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp

* commit '307aef01257cbba42f095f7020a4a3b753f3807b':
  LocationManager: Hide location provider and geocode provider APIs.
2010-09-20 17:19:04 -07:00
Mike Lockwood
307aef0125 Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 2010-09-20 17:16:03 -07:00
Mike Lockwood
e15735a9e0 LocationManager: Hide location provider and geocode provider APIs.
Also rename Geocoder.isImplemented() to Geocoder.isPresent()

BUG: 3000738
BUG: 3001413

Change-Id: I56bb4e9a9c59f8b79de585eeb168f74c3ff1a853
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-20 20:14:34 -04:00
Dianne Hackborn
0ce12e210e am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
2010-09-20 17:06:12 -07:00
Dianne Hackborn
e25a264c4e Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 2010-09-20 17:03:15 -07:00
Dianne Hackborn
c8314b05b4 DO NOT MERGE. Wifi service now blames apps for its wake lock use.
Change-Id: Ic57d8f77527bbfea6a129b8f348fe9108157b4d8
2010-09-20 16:58:41 -07:00
Dianne Hackborn
65b5a65e79 am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread
Merge commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp

* commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3':
  In theory the package manager now scans /vendor/app
2010-09-20 16:57:05 -07:00
Dianne Hackborn
4db643eb84 Merge "In theory the package manager now scans /vendor/app" into gingerbread 2010-09-20 16:54:22 -07:00
Scott Main
aac4630cc5 am a4270e7e: am 73e150c8: provide link to backup guide above the fold
Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp

* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
  provide link to backup guide above the fold
2010-09-20 16:40:46 -07:00
Scott Main
a4270e7e1e am 73e150c8: provide link to backup guide above the fold
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread

* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
  provide link to backup guide above the fold
2010-09-20 16:37:32 -07:00
Dianne Hackborn
3b4bac7a2a In theory the package manager now scans /vendor/app
Not tested.

Change-Id: Ib6120d645074c95dd0afd1476f6167aec5d50bb9
2010-09-20 16:35:22 -07:00
Dianne Hackborn
4b187e804f am 8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
2010-09-20 16:34:45 -07:00
Dianne Hackborn
8e1b84e765 Merge "Some battery improvements:" into gingerbread 2010-09-20 16:29:42 -07:00
Dianne Hackborn
ce2ef766ca Some battery improvements:
- New API for iterating over history that will allow a better implementation
  in the future.
- Now do writes asynchronously.

Also improve the documentation for Activity.onRetainNonInstanceState().

Change-Id: Idf67f2796a8868eb62f288bcbb2bad29876c8554
2010-09-20 16:25:01 -07:00
Mindy Pereira
ee63215903 am d3301e9f: Add mdpi images for overscroll EdgeGlow.
Merge commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp

* commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c':
  Add mdpi images for overscroll EdgeGlow.
2010-09-20 15:49:51 -07:00
Steve Howard
4735be0211 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
2010-09-20 15:43:43 -07:00
Mindy Pereira
d3301e9f6b Add mdpi images for overscroll EdgeGlow.
Fixes b/3019020 gingerbread needs overscroll resources for MDPI devices.

Change-Id: I42b2557d97f7766c30449f461090a05ef8e35c18
2010-09-20 15:42:33 -07:00
Steve Howard
d2319d8d9a Merge "New error status for "destination file already exists"." into gingerbread 2010-09-20 15:40:41 -07:00
John Wang
48ab399164 am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp

* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
  Use PhoneBase in the phone list.
2010-09-20 15:38:40 -07:00
John Wang
ee2ef3220f Merge "Use PhoneBase in the phone list." into gingerbread 2010-09-20 15:35:02 -07:00
Scott Main
73e150c886 provide link to backup guide above the fold
Change-Id: I84ad3fbd4c3c7793fbf330d6a2be5cab611a9b26
2010-09-20 14:11:18 -07:00
Brian Swetland
5c7465220d am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread
Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp

* commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
2010-09-20 14:08:46 -07:00
Brian Swetland
181e5ea808 Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 2010-09-20 14:05:25 -07:00
Steve Howard
a9e87c9cc3 New error status for "destination file already exists".
Also changing the behavior of the local URI column slightly to better
match the spec -- it should return the client-provided destination so
that it's valid even if the download failed.

Change-Id: Ibf9c07519e647e677ebac8b334b9f2e930e47033
2010-09-20 13:44:51 -07:00
Brian Swetland
a21c2009f1 support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
2010-09-20 12:58:15 -07:00
Hung-ying Tyan
852e5354f6 am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
  SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:51:07 -07:00
Hung-ying Tyan
8544560ccc SipPhone: fix missing-call DisconnectCause feedback
also fix delivering bad news before closing a SipAudioCallImpl object so that
apps can get the current audio-call object state before it's closed:

http://b/issue?id=3009262

Change-Id: I94c19dae8b4f252de869e614ec462b19b4ff2077
2010-09-20 13:06:30 +08:00
Hung-ying Tyan
97bc368bc4 am b17eae9e: SipService: move event handling out of system server\'s main thread
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp

* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
  SipService: move event handling out of system server's main thread
2010-09-19 19:14:30 -07:00
Hung-ying Tyan
b17eae9e22 SipService: move event handling out of system server's main thread
http://b/issue?id=2998047

Change-Id: Ibe0b6a19bb8b453fa852a94b3daf3cb80d7377b0
2010-09-20 10:10:34 +08:00
Hung-ying Tyan
37d1b2496e am 97963794: SIP: convert enum to static final int.
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
  SIP: convert enum to static final int.
2010-09-19 18:56:27 -07:00
Hung-ying Tyan
97963794af SIP: convert enum to static final int.
Converts SipErrorCode and SipSessionState.

Change-Id: Iee3a465649ea89d395b2336bbd673c25113e5f93
2010-09-20 09:51:31 +08:00
Hung-ying Tyan
cf1620d6dd am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp

* commit '5b930c49b12bdb1461a18491db768c642c38d498':
  SIP: add config flag for wifi-only configuration.
2010-09-19 18:11:44 -07:00
Hung-ying Tyan
5b930c49b1 Merge "SIP: add config flag for wifi-only configuration." into gingerbread 2010-09-19 18:02:13 -07:00
Hung-ying Tyan
c4b87477c0 SIP: add config flag for wifi-only configuration.
http://b/issue?id=2994029

Change-Id: I328da9b0f8b70d660dbcefffdac8250341792101
2010-09-20 08:03:20 +08:00
Mike Lockwood
b5994789af am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp

* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
2010-09-19 11:10:57 -07:00
Mike Lockwood
ba56dfce7c DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
This change is already in master

On some devices, switching the USB configuration to enable RNDIS can
result in multiple USB disconnect/reconnect events being generated.

Change-Id: I14b02aaca11bb708f6b3334e41a2f4d4fa7b7296
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-19 14:04:38 -04:00
Adam Powell
99f0f3676f am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp

* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
  Fix some drawing artifacts/bugs around overlays/text anchors
2010-09-17 19:30:03 -07:00
Jeff Brown
a8d95248bd am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread
Merge commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b' into gingerbread-plus-aosp

* commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b':
  Reduce lock thrashing in native Looper.
2010-09-17 19:29:50 -07:00
Adam Powell
4258bfb7a9 Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread 2010-09-17 19:15:38 -07:00
Adam Powell
23bd5f5075 Fix some drawing artifacts/bugs around overlays/text anchors
Change-Id: I28170d4e120506c09a1cfea721244fbcd3c2576a
2010-09-17 18:57:25 -07:00
John Wang
0a30e454eb Use PhoneBase in the phone list.
For bug 3001613.

Only use PhoneBase (not PhoneProxy) in CallManager.

Both PhoneBase and PhoneProxy implement Phone interface,

such as dial(). The real implementation, for

example in GSM,  is in GSMPhone extending from PhoneBase.

So that foregroundCall.getPhone() returns GSMPhone obj. On the other hand,

PhoneFactory.getDefaultPhone() returns PhoneProxy obj, which has a class

member of GSMPhone.

Therefore for phone returned by PhoneFacotry, which is used by PhoneApp,

        phone.getForegroundCall().getPhone() != phone

Change-Id: I8a304098dd86762aaee56fb3c8b76c883e8c9a4f
2010-09-17 18:07:23 -07:00
Jeff Brown
7d4739bed5 Merge "Reduce lock thrashing in native Looper." into gingerbread 2010-09-17 17:26:02 -07:00
Jeff Brown
9604987289 Reduce lock thrashing in native Looper.
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups.  There is no point grabbing the
semaphore then.

Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
2010-09-17 17:01:23 -07:00
Adam Powell
4a4a53ae07 am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp

* commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266':
  Fix silly touch bug in TextView. Oops.
2010-09-17 15:46:07 -07:00
Marco Nelissen
5c9f357994 am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp

* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 15:42:21 -07:00
Adam Powell
25945ca2e6 Merge "Fix silly touch bug in TextView. Oops." into gingerbread 2010-09-17 15:41:11 -07:00
Marco Nelissen
f30fae6338 Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread 2010-09-17 15:39:00 -07:00