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

33281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
8c4a042984 am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread 
Merge commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe'

* commit 'a86a6c4e326bfdfc351dacca95b23bb78f78efbe':
  Fixed an issue where the reserved free space in the file writer was larger than intended
 2010-10-06 16:17:14 -07:00
Nick Pelly
664d035829 am c7bfb13f: am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread 
Merge commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee'

* commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee':
  New API stubs: NdefMessage and NdefRecord.
 2010-10-06 16:16:56 -07:00
Alex Sakhartchouk
38d509697c Merge "changing vec4 to vec2 for perf reasons." 2010-10-06 16:09:36 -07:00
Gilles Debunne
3139ab218a am e9e94676: am 52810607: Revert "Restored ic_dialog_menu_generic asset." 
Merge commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02'

* commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02':
  Revert "Restored ic_dialog_menu_generic asset."
 2010-10-06 16:07:42 -07:00
Hung-ying Tyan
ee8a884f35 SIP: Fix busy authentication loop. 
Add a retry count and give up after two attempts.
Also stop auto registration when server is unreachable.
And rename onError() to restartLater() for better readability.

http://b/issue?id=3066573

Change-Id: Icfa65c58546a1e2bf8e59e29584a3926c53c479b
 2010-10-07 07:04:46 +08:00
Kenny Root
17eb6fb07c Add MountService tests and fix a bug it found 
Add some MountService tests that are based partially on some stuff done
in PackageManagerTests. This allows us to test the OBB changes in an
easy way.

Also, it found some bugs in the DefaultContainerService connection state
machine, so fix those while we're at it.

Change-Id: I18f38593be754eb32fb6e842f88eec47e2beefce
 2010-10-06 15:39:28 -07:00
Gilles Debunne
efaa4f075d resolved conflicts for merge of 1153629c to master 
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
 2010-10-06 14:38:27 -07:00
Gilles Debunne
1ae32bfebf New assets for buttons and notification 
Change-Id: I95ffa7600476f97e3be3c577ef55855abeaeac5e
 2010-10-06 14:32:29 -07:00
Dianne Hackborn
043fcd9847 Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider 
Exposes an Intent I need (okay it fixes an unrelated thing in the power widget),
and fixes some dump output.

Change-Id: I51d6c93a6ac879bab64e9d5aa21129e2bbcd461b
 2010-10-06 14:27:34 -07:00
Marco Nelissen
91b7b0a33f Merge "Fix simulator build, part 1/n" 2010-10-06 12:26:23 -07:00
Marco Nelissen
fd1e4ad52c Fix simulator build, part 1/n 
Change-Id: If0a42ab262ee6aa6381ce95bd49baf232adb01c5
 2010-10-06 12:23:02 -07:00
Neel Parekh
03bc711c8a Merge "Fix pressed vs selected typo in onCreateDrawableState" 2010-10-06 11:45:55 -07:00
Neel Parekh
e537858ba7 Fix pressed vs selected typo in onCreateDrawableState 
Change-Id: I7a415cacf29ed8c6c558f6b29902edd76fc98ea6
 2010-10-06 11:39:53 -07:00
Irfan Sheriff
be93061e2c Merge "Add LinkAddress" 2010-10-06 11:26:44 -07:00
Gil Dobjanschi
ff61e8bea7 Merge "Added VideoEditor reference to protected AudioTrack constructor" 2010-10-06 11:26:24 -07:00
Shimeng (Simon) Wang
e99b0b992a Merge "Add wrapper method for native JNI call." 2010-10-06 11:20:05 -07:00
Dianne Hackborn
6d44456da8 Merge "Make USB mass storage hide keyguard when shown." into gingerbread 2010-10-06 11:19:51 -07:00
Alex Sakhartchouk
d2091639be changing vec4 to vec2 for perf reasons. 
Change-Id: Ic885a6dc697af4fd82e184158772863673f041bd
 2010-10-06 11:15:01 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress 
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
 2010-10-06 11:04:05 -07:00
Gil Dobjanschi
0ca0a12c6b Added VideoEditor reference to protected AudioTrack constructor 
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
 2010-10-06 10:53:49 -07:00
Adam Cohen
32e60fbea7 Merge "Fixing AdapterViewAnimator crash when associated adapter is empty" 2010-10-06 10:43:18 -07:00
Adam Cohen
3042944c6e Fixing AdapterViewAnimator crash when associated adapter is empty 
Change-Id: I3186452eb93f1141b06531507b13d87804e684d4
 2010-10-06 10:39:11 -07:00
Irfan Sheriff
128cecab96 Add proxy settings per wifi network 
Provide per network proxy settings configuration
for wifi. This is stored along with the ip configuration
in ipconfig.txt

bug: 3039302
Change-Id: Ic8bc14493583be19fde3d7c463d1e5a77e6df25f
 2010-10-06 10:36:36 -07:00
Gil Dobjanschi
f62bedc5c0 Merge "Added the video editor to the media items and audio track constructors." 2010-10-06 10:25:20 -07:00
Fred Quintana
c8b7971cb3 Merge "Make a separate active sync queue for initialization and regular syncs." 2010-10-06 10:03:19 -07:00
Gil Dobjanschi
53f89e1230 Added the video editor to the media items and audio track constructors. 
Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
 2010-10-06 09:54:34 -07:00
Gil Dobjanschi
572eab6f17 Merge "Adjust start time and duration for overlays and effects." 2010-10-06 09:46:09 -07:00
Steve Block
e86b8a18df Merge "Make sure that we send the DeviceOrientation error event only once" 2010-10-06 08:30:13 -07:00
Steve Block
8980343b13 Make sure that we send the DeviceOrientation error event only once 
Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
 2010-10-06 16:12:06 +01:00
Chung-yih Wang
4790a2e243 am 18c00089: Merge "Misc fixes for sim-eng build." into gingerbread 
Merge commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb' into gingerbread-plus-aosp

* commit '18c000896f9cc77e790b92f29d4ddc18b213e1fb':
  Misc fixes for sim-eng build.
 2010-10-06 01:52:53 -07:00
Chung-yih Wang
18c000896f Merge "Misc fixes for sim-eng build." into gingerbread 2010-10-06 01:50:25 -07:00
Chung-yih Wang
fb116fbea3 Misc fixes for sim-eng build. 
Change-Id: I0c5dac1097abc924e66dab92d7d03d5051b4fd29
 2010-10-06 16:46:59 +08:00
Fred Chung
2bd6afed6c am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo 
Merge commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4' into gingerbread-plus-aosp

* commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4':
  Doc change: Adding new docs for Device Admin API.
 2010-10-05 23:45:29 -07:00
Fred Chung
b50d5ede6f am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo 
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread

* commit '30264c9b85109ae58c1e472a747bf47464cc1632':
  Doc change: Adding new docs for Device Admin API.
 2010-10-05 23:39:23 -07:00
Fred Chung
30264c9b85 Merge "Doc change: Adding new docs for Device Admin API." into froyo 2010-10-05 23:26:41 -07:00
Brian Carlstrom
c9d5b31f84 Fix instance count to be long 
Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
 2010-10-05 22:23:41 -07:00
Brian Carlstrom
c21550a8d1 Adding android.os.Debug.countInstancesOfClass 
- Debug.countInstancesOfClass is just a wrapper on
  dalvik.system.VMDebug.countInstancesOfClass to avoid code from
  depending on the dalvik classes directly

- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
  and ViewDebug are converted to the new Debug.countInstancesOfClass

- Existing use of OpenSSLSocketImpl.instanceCount, which is being
  removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)

Bug: 3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
 2010-10-05 21:38:57 -07:00
Robert Greenwalt
759bece170 Merge "Turn on some debugging info" 2010-10-05 19:14:45 -07:00
Robert Greenwalt
ba175a5e13 Turn on some debugging info 
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
 2010-10-05 19:12:26 -07:00
Dianne Hackborn
92d29c66f5 am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread 
Merge commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9' into gingerbread-plus-aosp

* commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9':
  Fix NPE if there is no accelerometer.
 2010-10-05 19:06:04 -07:00
Dianne Hackborn
a2a0a98ac7 Merge "Fix NPE if there is no accelerometer." into gingerbread 2010-10-05 19:02:52 -07:00
James Dong
b74ccaad18 Merge "Use setVideoSize API in StagefrightRecorder" 2010-10-05 19:01:10 -07:00
Dianne Hackborn
efa4f7f87d am 4e6baf24: Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread 
Merge commit '4e6baf2473e522e6d53afa01348c564148bfbad7' into gingerbread-plus-aosp

* commit '4e6baf2473e522e6d53afa01348c564148bfbad7':
  Fix issue #3001368: API REVIEW: android.app.Activity
 2010-10-05 18:59:57 -07:00
Dianne Hackborn
4e6baf2473 Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread 2010-10-05 18:56:54 -07:00
Dianne Hackborn
b499bb1069 Fix NPE if there is no accelerometer. 
Change-Id: I983290a7fc3deda2a82b03ff564f1b7201cc3dd3
 2010-10-05 18:54:49 -07:00
Hung-ying Tyan
88b4bd5f3e am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 
Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp

* commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
  CallManager/SipPhone: fix reject a ringing call
 2010-10-05 18:37:14 -07:00
Hung-ying Tyan
fc7e7766e7 Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 2010-10-05 18:33:22 -07:00
Hung-ying Tyan
17956e626b CallManager/SipPhone: fix reject a ringing call 
+ CallManager: fix getFirstActiveRingingCall(), getActiveFgCall(), getFirstActiveBgCall()
+ Set DisconnectCause to be INCOMING_REJECTED when a call is rejected

http://b/issue?id=3049671

Change-Id: Ica1d81ca4b71ab0ceb2ab437b82bbb4ccf86fe92
 2010-10-06 09:31:44 +08:00
Romain Guy
1e14f49d06 Merge "Optimize saveLayer() when the clip flag is set." 2010-10-05 18:16:35 -07:00
Gilles Debunne
ba04dbc6cd am 671b2a57: Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread 
Merge commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a' into gingerbread-plus-aosp

* commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a':
  Fix for IndexOutOfBounds in text pasting.
 2010-10-05 18:15:12 -07:00