Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,068 Commits 3 Branches 0 Tags
e2562ca8f19b227cd1fed97484cef428decedb02
Commit Graph

14263 Commits

Author SHA1 Message Date
Neal Nguyen
e2562ca8f1 am daa9b8c6: am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread 
Merge commit 'daa9b8c69a3069d5533176e6caa286380b4675c2'

* commit 'daa9b8c69a3069d5533176e6caa286380b4675c2':
  Fixing some flakiness of some DL Manager tests.
 2010-10-06 17:07:58 -07:00
Mathias Agopian
7930b5bc06 am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden 
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'

* commit '722665c5f76e81bed646490977ea30f38aaa00da':
  fix build. SurfaceView.setFrame needed to be hidden
 2010-10-06 17:07:30 -07:00
Mathias Agopian
3243cbc9b2 am b99e81ab: am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread 
Merge commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2'

* commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2':
  fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
 2010-10-06 16:17:44 -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
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
Gilles Debunne
efaa4f075d resolved conflicts for merge of 1153629c to master 
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
 2010-10-06 14:38:27 -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
Shimeng (Simon) Wang
e99b0b992a Merge "Add wrapper method for native JNI call." 2010-10-06 11:20:05 -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
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
Fred Quintana
c8b7971cb3 Merge "Make a separate active sync queue for initialization and regular syncs." 2010-10-06 10:03:19 -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
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
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
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
Vasu Nori
b8e109aa9e Merge "annotate some tests large - just in case they take longer. bug:3066136" 2010-10-05 17:08:53 -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
Chet Haase
2e292e9da4 Merge "Adding next/prev to fragment animations and to PreferenceActivity" 2010-10-05 15:21:34 -07:00
Gilles Debunne
a4a01b5d6b am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'

* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
  Removed icon in Alert dialog header.
 2010-10-05 15:17:17 -07:00
Chet Haase
9ff82bf2b3 Adding next/prev to fragment animations and to PreferenceActivity 
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).

Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
 2010-10-05 15:13:24 -07:00
Dianne Hackborn
90f4aafa33 Implement permission granting in clipboard. 
Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
 2010-10-05 14:09:08 -07:00
Romain Guy
e21635571e Merge "Code cleanup and disable display lists for now." 2010-10-05 13:44:24 -07:00
Romain Guy
469b1dbeaf Code cleanup and disable display lists for now. 
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
 2010-10-05 13:42:35 -07:00
Christopher Tate
a0374192b9 Make View.DragThumbnailBuilder a static class 
It also now uses a WeakReference to the associated View, not a hard
object pointer.

Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
 2010-10-05 13:14:25 -07:00
Dianne Hackborn
38014763a2 am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'

* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
  Fix issue #3041660: Camera image flips upside down when rotating device
 2010-10-05 12:54:41 -07:00
Vasu Nori
54f9ac5880 Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db" 2010-10-05 12:27:27 -07:00
Gilles Debunne
ff3c191d2a resolved conflicts for merge of 8390651c to master 
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
 2010-10-05 12:11:56 -07:00
Adam Cohen
ef52176f12 Changing AdapterViewAnimator to use the new animation APIs 
Change-Id: Ifefb83c391914ac623d75e0faca723b95786861d
 2010-10-05 11:02:25 -07:00
Vasu Nori
6d970255af STOPSHIP - add illegalStateException to catch potential deadlocks in db 
database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner

Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
 2010-10-05 10:50:45 -07:00
Patrick Scott
4243a3a6ed Add postSync so that the chrome stack has access. 
Bug: 3053149
Change-Id: I75f5422afcacf4ae70a2aa26188446251d7f84da
 2010-10-05 09:30:24 -04:00
Neal Nguyen
daa9b8c69a am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread 
Merge commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp

* commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368':
  Fixing some flakiness of some DL Manager tests.
 2010-10-04 21:09:52 -07:00
Neal Nguyen
95037fb1a6 Merge "Fixing some flakiness of some DL Manager tests." into gingerbread 2010-10-04 21:07:37 -07:00
Romain Guy
2fe9a8f6f6 Correctly invalidate the drawing cache when an invalidate is requested. 
Change-Id: Ic78f85d728a14a9f2e4a1925d46b6db9a204bbb1
 2010-10-04 20:19:34 -07:00
Mathias Agopian
722665c5f7 am ef115308: fix build. SurfaceView.setFrame needed to be hidden 
Merge commit 'ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp

* commit 'ef11530874f86570aa04a10c16a416b274b3fdf5':
  fix build. SurfaceView.setFrame needed to be hidden
 2010-10-04 20:18:51 -07:00
Mathias Agopian
ef11530874 fix build. SurfaceView.setFrame needed to be hidden 
Change-Id: I96b0896e24483e9b5db19c938cb6058868f34e48
 2010-10-04 20:15:08 -07:00
Adam Powell
815b1eb870 am 1c2911a6: Merge "Fix bug 3061769" into gingerbread 
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769
 2010-10-04 19:59:35 -07:00
Adam Powell
1c2911a648 Merge "Fix bug 3061769" into gingerbread 2010-10-04 19:56:49 -07:00
Mathias Agopian
b99e81ab4c am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread 
Merge commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3' into gingerbread-plus-aosp

* commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3':
  fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
 2010-10-04 19:52:41 -07:00
Mathias Agopian
7e6064ad7c Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread 2010-10-04 19:50:16 -07:00