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

53456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno Oliveira
f14192bc4f am ecf16143: am 0310f4da: am f5c62362: Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2 
* commit 'ecf161437e4a2f2e0493f303119e8b2f090739eb':
  Rewriting "Audio and Video" section of Dev Guide.
 2011-06-23 08:16:55 -07:00
Irfan Sheriff
e8c01e5c8a am a08c5520: (-s ours) am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling"" 
* commit 'a08c55208335a2dfd6642793d6b3cc2e86615282':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
 2011-06-23 08:16:49 -07:00
Irfan Sheriff
4ae8aa9c73 am 5389c80d: (-s ours) am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE 
* commit '5389c80d1f7c9d2710a47ccf70cce94c2d5d9599':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
 2011-06-23 08:16:44 -07:00
Eric Laurent
e2ac799dfc Merge "Added audio_bytes_per_sample() helper function" 2011-06-23 08:08:20 -07:00
Irfan Sheriff
afd2580afd am 20b6ded6: (-s ours) am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE 
* commit '20b6ded6e326e3fedb9f7e112773a82b94c4aca6':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
 2011-06-23 07:50:01 -07:00
Wink Saville
9b897922e1 am 446a436c: am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 
* commit '446a436cf3d6eb0ee2feb628efc84fda746dfe52':
  Use dataConnectionNotInUse to decide if a DC is free.
 2011-06-23 07:49:30 -07:00
Wink Saville
3b14c78466 am 66c37f5d: am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 
* commit '66c37f5df2b4cf469e90a0e9f7e0b336f56e8433':
  Fix handling of unsol_data_state_change with PDP sharing scenario
 2011-06-23 07:49:16 -07:00
Wink Saville
7bfb80d122 am 47e31924: am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 
* commit '47e319247e89ab4ba30f58e5f532454ef21d15e6':
  Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
 2011-06-23 07:49:09 -07:00
Wink Saville
b939b4d36a am 1773120c: am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE 
* commit '1773120c1e9aeebc917e1bb6c1241aecfe9d6500':
  Special retry back-off timer in call setup failure.
 2011-06-23 07:49:02 -07:00
Irfan Sheriff
e35446e8f4 am e8898d4a: (-s ours) am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2 
* commit 'e8898d4a4441b590c3c6e6336cfbb53fcd853775':
  DO NOT MERGE Revert "Fix lease duration handling"
 2011-06-23 07:48:38 -07:00
Jaikumar Ganesh
6839550fd9 am f50ef6a4: (-s ours) am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread 
* commit 'f50ef6a43d721e933fd596113f8ae6644b29f3f5':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
 2011-06-23 07:48:31 -07:00
Bruno Oliveira
3987ea1557 am a62f707d: am f1c71771: am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2 
* commit 'a62f707da28226d5c6d160d1f0e21a65dcfba5fc':
  Integrating RandomMusicPlayer sample into tree.
 2011-06-23 07:47:39 -07:00
Scott Main
cf828c41eb am 69ff6a47: am a6632992: am 04295266: add api level 13 flag for docs 
* commit '69ff6a47c6e302f1b8aaeccffea3434f1edc4ee6':
  add api level 13 flag for docs
 2011-06-23 07:47:31 -07:00
Daniel Sandler
e07141a562 am e89d4b5d: am e0da3f3b: am 444336dd: Merge "Fix crazy notification panel background." into honeycomb-mr2 
* commit 'e89d4b5d6952031c31f15db95435e7541e5df08c':
  Fix crazy notification panel background.
 2011-06-23 07:41:37 -07:00
Scott Main
80a0fa0b69 am fe8e2fb3: am de937ac0: am bb64fa1e: docs: fix a couple typos 
* commit 'fe8e2fb32febccc5c88ca4eba089d747755975d4':
  docs: fix a couple typos
 2011-06-23 07:41:29 -07:00
Scott Main
b0f0245297 am 35837c32: am 20fe290e: am beeb7762: docs: fix broken link 
* commit '35837c3234a2e888d0a1016f71c5b371a7014f4e':
  docs: fix broken link
 2011-06-23 07:41:15 -07:00
Robert Greenwalt
33d0de6965 am e813ea5a: am 4906376f: Just a random fix. 
* commit 'e813ea5a11db8070d2ca72cab416fa1a8fd3539c':
  Just a random fix.
 2011-06-23 07:40:49 -07:00
Hung-ying Tyan
37a43f304b Merge "Keep the keepalive process going after NAT port is changed." 2011-06-23 04:29:45 -07:00
Hung-ying Tyan
12750701d0 Keep the keepalive process going after NAT port is changed. 
This is a regression from the CL that makes the keep-alive process a reusable
component.

Change-Id: I1d580588e9e303c532bf620056fc0fe88a2fdcda
 2011-06-23 18:23:09 +08:00
Grace Kloba
cf559377b7 Add onSurfaceTextureUpdated to the TextureView listener. 
The app needs a way to throttle the producer side. Expose this to enable it.

Change-Id: I04b6a3fc444117a9fc2449fb87c3c834247c8ef1
 2011-06-22 23:05:40 -07:00
Jeff Sharkey
ea5f51909b Merge "Enable bandwidth module from stats service." 2011-06-22 22:21:31 -07:00
Adam Powell
7656b21e63 Fix build 
Change-Id: Ieb5f82380b6c69791ab7b4dd3e1d76fdb4dd0b74
 2011-06-22 21:58:14 -07:00
Jeff Sharkey
0a9ee1272b Enable bandwidth module from stats service. 
During systemReady(), tell netd to enable bandwidth tracking module,
which is used to provide detailed stats and controls.

Change-Id: Iecfd8b17a3b90f5a817d731fbe1c71777681ed6e
 2011-06-22 21:44:12 -07:00
Adam Powell
e54e39bea9 Merge "Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable" 2011-06-22 21:38:48 -07:00
Hung-ying Tyan
ea380219df Merge "Move the keepalive process to SipSessionImpl and make it reusable." 2011-06-22 21:38:27 -07:00
Adam Powell
fbca76965b Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable 
Change-Id: I659201124c4c6730046be55a918c64ca57a9f4db
 2011-06-22 21:29:19 -07:00
Adam Powell
d9b0ee029f Merge "Tweak action bar metrics." 2011-06-22 21:14:42 -07:00
Romain Guy
8b4512ef20 Merge "Prevent possible NPE in TextureView" 2011-06-22 21:02:31 -07:00
Romain Guy
1ec3a58bcd Prevent possible NPE in TextureView 
Change-Id: I539813d614c7eb1f68dad6b605cbad5b5144c5e9
 2011-06-22 21:01:58 -07:00
Romain Guy
c2e0a1f1cd Merge "Add the ability to specify the opacity of a TextureView" 2011-06-22 20:59:46 -07:00
Romain Guy
a9489274d6 Add the ability to specify the opacity of a TextureView 
TextureView assumes its content is opaque by default.

Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
 2011-06-22 20:58:11 -07:00
Adam Powell
0d5d1b7e8c Tweak action bar metrics. 
Free up some more pixels in the action bar and better define how icons
within it resize.

Change-Id: I0768180e595ee7b23190a26607e8989fa1bac38f
 2011-06-22 20:41:44 -07:00
Hung-ying Tyan
4a267a9158 Move the keepalive process to SipSessionImpl and make it reusable. 
Reuse the new component in the original keepalive process and the NAT port
mapping timeout measurement process.

This is the foundation for fixing the following bug.

Bug: 3464181

Change-Id: If7e951c000503fa64843942ad062c4d853e20c8d
 2011-06-23 11:41:37 +08:00
Nick Pelly
b8a8c7a279 resolved conflicts for merge of 6ce70394 to master 
Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf
 2011-06-22 20:32:36 -07:00
Xia Wang
fdd33e0144 Merge "Fix issues in Opengl Benchmark tests: - fix live wallpaper drawing, bind the global vertex program after it - scale the icons according to render surface in display icons, also add a background for the icon display test case." 2011-06-22 19:34:34 -07:00
Jim Miller
71c77aa822 Merge "Update LockScreen layouts to latest UX spec." 2011-06-22 18:10:02 -07:00
Shimeng (Simon) Wang
6ecf3e90f2 Merge "Use local variable instead of webview method." 2011-06-22 17:58:57 -07:00
Shimeng (Simon) Wang
b30381d783 Use local variable instead of webview method. 
This removes the thread warning.

Change-Id: Id2eec46fda8413cfaed49d2a97de40491b7496a2
 2011-06-22 17:44:27 -07:00
Conley Owens
1c5d9dec7b am 587e9563: am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" 
* commit '587e9563d61beaaa67090eddd99b737847561eb9':
  Check if we are in daylight time when calculating timezone
 2011-06-22 17:37:19 -07:00
Chet Haase
ef716baaa0 Merge "Fix flashing artifacts caused by invalidation bugs" 2011-06-22 17:17:02 -07:00
Romain Guy
5ab03d5fa9 Merge "Fix another memory leak in OpenGLRenderer" 2011-06-22 17:12:14 -07:00
Romain Guy
d586ad9c9f Fix another memory leak in OpenGLRenderer 
Change-Id: I23ed56891452a05cf3ca13f6919c4fef90d5ff4e
 2011-06-22 17:10:00 -07:00
Jaikumar Ganesh
ae16cd8137 Merge "Get the profile proxies after the BT Service is up." 2011-06-22 17:05:21 -07:00
Jaikumar Ganesh
78ff1a658b Get the profile proxies after the BT Service is up. 
Trying to get the profile proxies before service is up will
cause a NPE.

Change-Id: I604041d6823775abbc2fe10794afaac83d6827ce
 2011-06-22 16:55:32 -07:00
Romain Guy
ac3e355bc9 Merge changes I00b54796,Iac465b72 
* changes:
  Change max heap size to 48MB
  Fix memory leak in OpenGLRenderer.
 2011-06-22 16:14:58 -07:00
Romain Guy
83c033de06 Change max heap size to 48MB 
Change-Id: I00b547960c07f1cbe753c3a1391fd3840bd70ea3
 2011-06-22 16:12:41 -07:00
Jim Miller
08a975ef86 Update LockScreen layouts to latest UX spec. 
- better placement and consistent handling of emergency button.
- use new GridLayout for landscape modes.
- add dimensionable parameters for time and status line fonts.
- fix assets and emergencyCallButton resource references when building for tablets.

Change-Id: I5f4c9cfb6a88ce3ccd8ab4fdafede8e6e59f9407
 2011-06-22 16:08:09 -07:00
Chet Haase
ad4f70306b Fix flashing artifacts caused by invalidation bugs 
Therea re 2 fixes here:
- We sometimes cleared a flag in ViewAncestor too soon that controlled
how invalidated areas were redrawn (related to whether the invalidates
happened on opaque views or not).
- TransitionDrawable was always setting/restoring alpha values on its
drawables every time it was drawn. setAlpha on BitmapDrawable causes
an invalidation, so essentially this was an infinite invalidation/redrawing
loop. The fix was to notice when the animation was done and to simply
draw the appropriate drawable[s].

Change-Id: I1849a5a909b0039a0e9bce0aa3cfc33c50f8f854
 2011-06-22 15:53:53 -07:00
Romain Guy
f6a63ae3a7 Fix memory leak in OpenGLRenderer. 
When creating a display list, matrices are duplicated locally. They
were however never deleted, thus causing apps to slowly leak memory
(a matrix is about 40 bytes.)

Change-Id: Iac465b720d4c4c9b5ca3fce870c0c912c14a74ab
 2011-06-22 15:13:09 -07:00
Romain Guy
4d65fdc810 Merge "Collapse UI events in TextureView." 2011-06-22 15:01:59 -07:00