Commit Graph

1107 Commits

Author SHA1 Message Date
Brian Carlstrom
c9ad7c6dbb resolved conflicts for merge of 41e99538 to master
Change-Id: Idddb72e369f127cd74322c3c7385701c2412e343
2010-09-01 12:41:36 -07:00
Brian Carlstrom
41e9953863 am 17510863: New Java-based SamplingProfiler
Merge commit '1751086360056bc60d00f2ed2988bc82be9e7bd9' into gingerbread-plus-aosp

* commit '1751086360056bc60d00f2ed2988bc82be9e7bd9':
  New Java-based SamplingProfiler
2010-09-01 10:44:56 -07:00
Brian Carlstrom
1751086360 New Java-based SamplingProfiler
Summary:
- libcore: new Java based SamplingProfiler
- dalvik: remove old SamplingProfiler native bits
- frameworks/base: New placeholder SamplingProfilerIntegration
- vendor/google: remove old profiler snapshot parsing code

Details:

libcore

   A new 100% Java SamplingProfiler. While it has more overhead that
   the old native one, the new one can actually collect more than the
   current PC and frame pointer, so you can get useful context of
   where your app is spending time. It currently provides ASCII hprof
   format output for use with tools like PerfAnal
	dalvik/src/main/java/dalvik/system/SamplingProfiler.java

    Unit test for the new SamplingProfiler
	dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java

    Add core-tests-dalvik
	JavaLibrary.mk

dalvik

    Removing native code that supported the old SamplingProfiler
	vm/Dvm.mk
	vm/native/InternalNative.c
	vm/native/dalvik_system_SamplingProfiler.c

frameworks/base

  Placeholder SamplingProfilerIntegration. Later plans include
  generating EventStackTrace protobufs.

    New SamplingProfiler does not have a global instance, so
    SamplingProfilerIntegration provides one in INSTANCE. Old binary
    snapshot format is temporily replaced with ASCII hprof data.
	core/java/com/android/internal/os/SamplingProfilerIntegration.java

    Simplified interface for zygote profile snapshotting
	core/java/com/android/internal/os/ZygoteInit.java

    Current SamplingProfilerIntegration does not track event loop
    explicitly, but hprof information does include thread information.
	core/java/android/app/ActivityThread.java

vendor/google

    Removing code for parsing old SamplingProfiler snapshot format
	tools/samplingprofiler/Android.mk
	tools/samplingprofiler/NOTICE
	tools/samplingprofiler/profiler.iml
	tools/samplingprofiler/profiler.ipr
	tools/samplingprofiler/pull-snapshots.sh
	tools/samplingprofiler/sorttable.js
	tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
2010-09-01 10:17:25 -07:00
Dianne Hackborn
2394c164a7 am ec438e14: am 361199b5: Add PackageManager API to get information about a provider component.
Merge commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e'

* commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e':
  Add PackageManager API to get information about a provider component.
2010-08-31 19:06:25 -07:00
Dianne Hackborn
ec438e1448 am 361199b5: Add PackageManager API to get information about a provider component.
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp

* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
  Add PackageManager API to get information about a provider component.
2010-08-31 19:03:36 -07:00
Dianne Hackborn
361199b5e7 Add PackageManager API to get information about a provider component.
Kind-of useful when all you have is a ComponentName.

Change-Id: I9a99f12daabb29e97e882e09c43ca0df70c00651
2010-08-31 18:59:04 -07:00
Brad Fitzpatrick
02f4f0eb49 am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4'

* commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4':
  Renaming SharedPreferences$Editor.startCommit to apply
2010-08-30 18:25:02 -07:00
Brad Fitzpatrick
734d270769 am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp

* commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972':
  Renaming SharedPreferences$Editor.startCommit to apply
2010-08-30 18:18:54 -07:00
Brad Fitzpatrick
66fce5068a Renaming SharedPreferences$Editor.startCommit to apply
Also removes the artifical restriction that only one apply() can be in
flight at once.  That was old from when I thought it'd end up being
required, but wasn't.

Change-Id: I3540ea8be6e0760d6a51d218186f71655c2f3f55
2010-08-30 18:10:49 -07:00
Daniel Sandler
44af754cf0 am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE
Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp

* commit 'd02bdaab495641ab50e2123fdfd99a819cc40540':
  Remove experimental immersive mode support. DO NOT MERGE
2010-08-27 20:00:29 -07:00
Daniel Sandler
d02bdaab49 Remove experimental immersive mode support. DO NOT MERGE
Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
2010-08-27 22:57:39 -04:00
Kenny Root
818c830c59 am 83285781: am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '8328578152fbfd23952a6cda4b2e60853d78eb74'

* commit '8328578152fbfd23952a6cda4b2e60853d78eb74':
  Allow native shared libraries in ASEC containers
2010-08-27 18:11:06 -07:00
Kenny Root
8328578152 am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp

* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
  Allow native shared libraries in ASEC containers
2010-08-27 16:45:45 -07:00
Kenny Root
85387d7ba3 Allow native shared libraries in ASEC containers
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.

Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.

Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
2010-08-27 16:40:06 -07:00
Brad Fitzpatrick
7f7ce40f90 resolved conflicts for merge of 28130bae to master
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
2010-08-27 12:08:40 -07:00
Dianne Hackborn
41bfa37cb2 resolved conflicts for merge of 409b7120 to master
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
2010-08-27 12:04:26 -07:00
Brad Fitzpatrick
333b8cba99 SharedPreferences$Editor.startCommit()
Adds a fire-and-forget save method (startCommit) to the
SharedPreferences.Editor, which is the way most people use it anyway.

This commit adds the implementation.  The previous commit added the
interface and docs:

   previous change: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
        git commit: edf32d0131

In addition, this change:

-- adds a generic "runPendingWorkFinishers" mechanism to
   ActivityThread to wait on async operations that are still
   in flight and use it for this.

-- ties runPendingWorkFinishers into Activity.onPause,
   BroadcastReceiver, and Service.

-- makes sSharedPreferences keyed on name, not File, to avoid
   unnnecessary allocations

-- documents and guarantees what thread
   OnSharedPreferenceChangeListener callbacks run on

-- makes a few things in frameworks/base use startCommit(), notably
   Preference.java (which was ignoring the return value anyway)

Change-Id: I1c8db60ad45643226fe6d246d3e513eeb7bd0ebd
2010-08-27 09:10:11 -07:00
Jason parks
6ed50de6d1 Deprecated the managed cursor API's on Activity. Loaders are the new world order.
Change-Id: I0c7d403e9e6c0fcdf6fea886d8c284341e2f6c88
2010-08-27 09:29:15 -05:00
Dianne Hackborn
5f36c96f6d Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work...
...when it is called before the parent Activity becomes ready.

Change-Id: Id021564ebb3419353234e459b7358b9a72660715
2010-08-26 15:56:59 -07:00
Dianne Hackborn
409b71201a am 02486b13: Hide heavy-weight API.
Merge commit '02486b1327e3007c62d253dd89ba9db1852b87f8' into gingerbread-plus-aosp

* commit '02486b1327e3007c62d253dd89ba9db1852b87f8':
  Hide heavy-weight API.
2010-08-26 14:46:43 -07:00
Dianne Hackborn
02486b1327 Hide heavy-weight API.
And give it a better name, for when it is later un-hidden.

Change-Id: Iae0d3054d44f873b9f953bc41d175a47802a185e
2010-08-26 14:41:58 -07:00
Dianne Hackborn
c8f8497b9c resolved conflicts for merge of 66d633d2 to master
Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586
2010-08-25 23:14:44 -07:00
Dianne Hackborn
66d633d208 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp

* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
  Don't retain global ref to last inflated context.
2010-08-25 22:02:18 -07:00
Dianne Hackborn
7e269644fc Don't retain global ref to last inflated context.
Also rework URI permission granting to support upcoming
clipboard use.

Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
2010-08-25 21:50:54 -07:00
Brad Fitzpatrick
4cbc4f1067 am 49209cbc: am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread
Merge commit '49209cbcef37c4b20c9d0649ba284a51144b3930'

* commit '49209cbcef37c4b20c9d0649ba284a51144b3930':
  Start of SharedPreferences$Editor.startCommit()
2010-08-25 16:40:06 -07:00
Brad Fitzpatrick
49209cbcef am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread
Merge commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp

* commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4':
  Start of SharedPreferences$Editor.startCommit()
2010-08-25 15:19:57 -07:00
Brad Fitzpatrick
edf32d0131 Start of SharedPreferences$Editor.startCommit()
No implementation yet, just the interface.

Change-Id: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
2010-08-25 13:13:36 -07:00
Chet Haase
71fcc470eb Merge "Change animator xml importing to use new inflater class" 2010-08-25 08:17:26 -07:00
Chet Haase
d51d368f2d Change animator xml importing to use new inflater class
Change-Id: I97225ee9868f4dcce5e4c1ba55e16414eb6c0464
2010-08-24 19:37:19 -07:00
Dianne Hackborn
cf44040d93 resolved conflicts for merge of d3cd2596 to master
Change-Id: I61a37a3be8b8115b225da272903ca917c33ae4a6
2010-08-24 17:47:42 -07:00
Brad Fitzpatrick
7f9106fb1f am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca'

* commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca':
  Some StrictMode API changes.
2010-08-24 16:58:27 -07:00
Dianne Hackborn
d3cd259675 am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp

* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
  Verify that onPause() calls its superclass.
2010-08-24 14:47:46 -07:00
Dianne Hackborn
4af0cfad53 Merge "Verify that onPause() calls its superclass." into gingerbread 2010-08-24 14:44:42 -07:00
Brad Fitzpatrick
6cf1a8bfb0 am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp

* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
  Some StrictMode API changes.
2010-08-24 14:18:26 -07:00
Chet Haase
49afa5bc10 Add facilities for layout transitions
Change-Id: I5c73ce6c6ba3bc9e3b57fcfbbcab37d511db6132
2010-08-24 13:09:20 -07:00
Dianne Hackborn
e794e9f9b7 Verify that onPause() calls its superclass.
Change-Id: Ibf48992b4445bfc726ade307aad26f3e9577c5fb
2010-08-24 12:32:10 -07:00
Brad Fitzpatrick
97461bd25c Some StrictMode API changes.
* rename setThreadBlockingPolicy to setThreadPolicy (opens the way to
  using StrictMode for non-blocking-related things in the future?)

* add allowThreadDiskWrites() and allowThreadDiskReads() to modify the
  current policy mask and return the old one.  this will allow turning
  off part of StrictMode during certain regions of code.  (for
  instance, writing to disk in Activity onPause...)

Change-Id: Ia1878153713f79299971fdab567fa15b3cb9d56c
2010-08-24 11:47:19 -07:00
Scott Main
385a655b8e am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f'

* commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f':
  docs: add links from widget classes to tutorials
2010-08-21 09:44:53 -07:00
Dianne Hackborn
37444f4239 am d172594e: am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread
Merge commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b'

* commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b':
  Fix issue #2845673: android:exported="false" is not obeyed
2010-08-21 09:34:43 -07:00
Dianne Hackborn
727782053c Work on DialogFragment and docs.
- DialogFragment now has an option to not show a dialog, so you can
  use your UI somewhere else.
- Deprecated show() versions that were tied to activities.
- Added documentation to DialogFragment class.
- Added documentation to onSaveInstanceState() to explain how the
  time it is called is different than Activity's version.
- Fixed some java doc warnings.

Change-Id: If026744c368e2443030d2d9e0a9c808d820857df
2010-08-20 18:32:41 -07:00
Brad Fitzpatrick
a3f641f22a am cf2c68c9: am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Merge commit 'cf2c68c9c21b8af62e95374312355d22ed55e586'

* commit 'cf2c68c9c21b8af62e95374312355d22ed55e586':
  Avoid unnecessary SharedPrefences disk writes.
2010-08-20 06:28:08 -07:00
Scott Main
bb8d314b6c am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp

* commit '70c9ffbc838271f0ea27a4780eb146287de53ef6':
  docs: add links from widget classes to tutorials
2010-08-19 17:40:10 -07:00
Scott Main
70c9ffbc83 am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '11a72482a0cdc45ceaf4ca83957e682381455aee' into gingerbread

* commit '11a72482a0cdc45ceaf4ca83957e682381455aee':
  docs: add links from widget classes to tutorials
2010-08-19 17:37:31 -07:00
Scott Main
41ec65355b docs: add links from widget classes to tutorials
Change-Id: I817e885524951853182b0458df4a32dea1614243
2010-08-19 17:07:13 -07:00
Dianne Hackborn
d172594e3a am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread
Merge commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab' into gingerbread-plus-aosp

* commit 'cf6d2a1de274e9a4156b12be811a180eb36412ab':
  Fix issue #2845673: android:exported="false" is not obeyed
2010-08-18 17:08:36 -07:00
Dianne Hackborn
b424b633bb Fix issue #2845673: android:exported="false" is not obeyed
Thou shall obey.

Change-Id: I09f163a0db7cc9189c8d7f5116cc8ca9d4f7a76c
2010-08-18 16:07:35 -07:00
Brad Fitzpatrick
cf2c68c9c2 am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Merge commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade' into gingerbread-plus-aosp

* commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade':
  Avoid unnecessary SharedPrefences disk writes.
2010-08-18 14:23:23 -07:00
Dianne Hackborn
291905e34a Maybe fix #2925641: calling onCreateOptionsMenu before attached activity
Also add some APIs to PreferenceActivity.

Change-Id: I85894a3eb9cd3e5adb78b82e85454c0d74773178
2010-08-17 18:53:19 -07:00
Adam Powell
e67a9dc83d Clean up some options menu/action bar menu handling for Dialogs.
Add Dialog#invalidateOptionsMenu so that dialogs hosting action bars
have a way to request a refresh of menu content.

Change-Id: I73aa22c2df1c5e60b94035e30af548f87073dbb9
2010-08-17 18:06:15 -07:00