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

33211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Romain Guy
eb99356a05 Optimize saveLayer() when the clip flag is set. 
This speeds up applications, especially Launcher.
 2010-10-05 18:14:38 -07:00
Gilles Debunne
671b2a57bb Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread 2010-10-05 18:11:09 -07:00
Dianne Hackborn
3c4c2b7e6f Fix issue #3001368: API REVIEW: android.app.Activity 
Bye bye, lots of junk.

Change-Id: Idd72fc525851277362b2a1ff3bb0f7865fe655fd
 2010-10-05 18:07:54 -07:00
Dianne Hackborn
0f8ee7439a Merge "Implement permission granting in clipboard." 2010-10-05 17:54:35 -07:00
Vasu Nori
ecba4f3373 Merge "fix broken build" 2010-10-05 17:46:36 -07:00
Vasu Nori
c2ce721fcf fix broken build 
Change-Id: Ic00e8b98780d48928e05ee27f855e8211fb1ec47
 2010-10-05 17:45:37 -07:00
Gilles Debunne
330e263c4a Fix for IndexOutOfBounds in text pasting. 
Made paste safe even in case of replace problems due to filters.

Bug 3042016

Change-Id: I9be34fa41fa6117502bbd959f91c562f28fb4237
 2010-10-05 17:33:08 -07:00
Gil Dobjanschi
e5867ef3f0 Adjust start time and duration for overlays and effects. 
Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
 2010-10-05 17:25:23 -07:00
Fred Quintana
918339ab82 Make a separate active sync queue for initialization and regular syncs. 
This entails allowing multiple syncs to happen in parallel, with
different limits for regular and initialization syncs.

Change-Id: I0e47c6515af5c98faf899f91855b342b0d0c708c
 2010-10-05 17:25:19 -07:00
Eric Laurent
ce2e2184bb am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 
Merge commit '37947afe904220bdf0a1a85a22824d8619be8e36' into gingerbread-plus-aosp

* commit '37947afe904220bdf0a1a85a22824d8619be8e36':
  Fixed AudioFlinger not always pausing tracks
 2010-10-05 17:10:59 -07:00
Vasu Nori
b8e109aa9e Merge "annotate some tests large - just in case they take longer. bug:3066136" 2010-10-05 17:08:53 -07:00
Eric Laurent
37947afe90 Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 2010-10-05 17:06:16 -07:00
Kenny Root
4f65ea6055 am bfa33b94: am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread 
Merge commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b'

* commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b':
  Use pread() in ZipFileRO for Linux
 2010-10-05 17:02:42 -07:00
Gilles Debunne
0f935ebfff am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset. 
Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800'

* commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
  Restored ic_dialog_menu_generic asset.
 2010-10-05 17:02:27 -07:00
Shimeng (Simon) Wang
bf01312965 Add wrapper method for native JNI call. 
This is to check whether a given mimeType is supported in Android media
framework.

issue: 2816278
Change-Id: I66d379d039c4e1f4a8528654ece006335fd4463f
 2010-10-05 16:59:05 -07:00
Vasu Nori
790762ca8f annotate some tests large - just in case they take longer. bug:3066136 
Change-Id: I89ab0454f592748f971b678a3ae23724eb6fc2e5
 2010-10-05 16:53:57 -07:00
Vasu Nori
572ce01e9e Merge "turn off some useless messages" 2010-10-05 16:53:24 -07:00
Vasu Nori
b7e2c783af turn off some useless messages 
Change-Id: I5ed5696cd052b70e7cf7b872205470cd56fada90
 2010-10-05 16:50:51 -07:00