Commit Graph

318 Commits

Author SHA1 Message Date
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
Dianne Hackborn
917d88213e am fde7fdd3: am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c'

* commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c':
  Fix a fun bug with multiple service bindings from an activity.
2010-08-25 16:40:55 -07:00
Dianne Hackborn
fde7fdd38d am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp

* commit '50395e80718e77d27ec5e2d474b255e05de68d82':
  Fix a fun bug with multiple service bindings from an activity.
2010-08-25 16:33:57 -07:00
Dianne Hackborn
43d9ac81f7 Fix a fun bug with multiple service bindings from an activity.
There was a flaw in the service management, when the same activity
is doing a bindService() for the same service IBinder.  In this case
the activity would correctly keep a list of all generated connections,
however some other data structures would assume there is only one
connection per IBinder, and thus only remember the last.

When that last connection was unbound, the service would be destroyed
since it thought there were no more connections.  Then when the
activity was finished, it would try to destroy the service again and
end up with an ANR because the service was already gone and would
not respond.

Change-Id: I59bde38bc24e78147b90b0a7cd525c2a1d20489f
2010-08-25 15:09:17 -07:00
Dianne Hackborn
103bff317b am 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '5474b0f8603ee66413c3e44600ca46f162f3089e'

* commit '5474b0f8603ee66413c3e44600ca46f162f3089e':
  Fix bugs with granting permissions through onNewIntent().
2010-08-24 09:01:54 -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
5474b0f860 am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '39792d2262352ae775091876d5488d2412a2ff92' into gingerbread-plus-aosp

* commit '39792d2262352ae775091876d5488d2412a2ff92':
  Fix bugs with granting permissions through onNewIntent().
2010-08-20 11:53:29 -07:00
Dianne Hackborn
39792d2262 Fix bugs with granting permissions through onNewIntent().
It would grant the permission to the temporary ActivityRecord,
not the real one, so it never got cleaned up.

Also allow granting of permissions to services because...  well,
it would be really really useful.  And it introduces some
refactoring that we'll need to support cut/paste.

Change-Id: If521f509042e7baad7f5dc9bec84b6ba0d90ba09
2010-08-20 11:50:00 -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
Dianne Hackborn
a10382b67d am 2e47052f: am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread
Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c'

* commit '2e47052fc4ad3439adc2322fd953fd58a85d457c':
  Fix problems with determining when to kill apps for wake usage.
2010-08-16 15:18:27 -07:00
Dianne Hackborn
0a56fdc140 am 66b0343e: am a8d9291d: Merge "Various battery info things:" into gingerbread
Merge commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b'

* commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b':
  Various battery info things:
2010-08-16 15:17:46 -07:00
Dianne Hackborn
2e47052fc4 am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread
Merge commit '567722eee190f7cf88dc7ea95167db76d5514842' into gingerbread-plus-aosp

* commit '567722eee190f7cf88dc7ea95167db76d5514842':
  Fix problems with determining when to kill apps for wake usage.
2010-08-15 17:34:49 -07:00
Dianne Hackborn
1ebccf531d Fix problems with determining when to kill apps for wake usage.
Also improve debug printing of various times.

Change-Id: Ifcc288fd1bcbf44c069875ba97925b9e7ffe9a48
2010-08-15 17:27:29 -07:00
Dianne Hackborn
66b0343e9e am a8d9291d: Merge "Various battery info things:" into gingerbread
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp

* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
  Various battery info things:
2010-08-13 16:00:44 -07:00
Dianne Hackborn
9adb9c3b10 Various battery info things:
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.

And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background.  This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.

Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
2010-08-13 15:17:49 -07:00
Dianne Hackborn
ed6075943f am 2d8b9fe0: am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984'

* commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984':
  New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:25:42 -07:00
Dianne Hackborn
2d8b9fe0f9 am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread
Merge commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07' into gingerbread-plus-aosp

* commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07':
  New system property "sys.boot_completed" set to 1 when boot completed.
2010-08-11 15:20:34 -07:00
Dianne Hackborn
f4c454bac9 New system property "sys.boot_completed" set to 1 when boot completed.
Change-Id: Ie3fc0b1efdfb637b0c780064a71e8c1575e15ca3
2010-08-11 12:47:41 -07:00
Jean-Baptiste Queru
1ca94798cc Fix build: HistoryRecord is now ActivityRecord
Change-Id: I5f402e76fbff58ec59ea26b6765e7455801a6cd0
2010-08-11 11:56:21 -07:00
Dianne Hackborn
9f53119b72 First pass at a new clipboard API.
ClipboardManager was in android.text(!!) so it needed to be moved
up to android.content to have access to the richer data types we
now need.

ClippedData is the data representation.  Still needs a lot of
fleshing out to allow holding more than one data type at a time
and perhaps conversions between them.  (MIME-oriented interrogation
and conversion will be done through ContentProvider, which needs
to grow an ability to report multiple MIME types and accept a
desired MIME type when a stream is being opened.)

Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
2010-08-05 12:28:20 -07:00
Brad Fitzpatrick
86dde2d64c am e2d33bbc: am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301'

* commit 'e2d33bbc496192d49c1e48baad446d8d0720d301':
  StrictMode: time violations in Binder calls
2010-07-30 15:27:56 -07:00
Brad Fitzpatrick
e2d33bbc49 am d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit 'd2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp

* commit 'd2165cfce7911dac66d1195ed9123e79b086d22b':
  StrictMode: time violations in Binder calls
2010-07-30 15:23:19 -07:00
Brad Fitzpatrick
cb9ceb1029 StrictMode: time violations in Binder calls
Change-Id: I5796993dce98be722cf679b78acaf0c9de0ba461
2010-07-30 14:28:55 -07:00
Jean-Baptiste Queru
5ea89f77ea Fix build: HistoryRecord is now ActivityRecord
Change-Id: Ide07d72abd02aeb7e56695f2e98ae7af1568ad1c
2010-07-30 09:30:31 -07:00
Mattias Larsson
5f5548e82d am 85673d91: am a4fd0078: Clear preferred activities when home process crashes
Merge commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d'

* commit '85673d91681e6b5dede0c72f36ed3b81f5c4bb0d':
  Clear preferred activities when home process crashes
2010-07-30 08:51:09 -07:00
Mattias Larsson
85673d9168 am a4fd0078: Clear preferred activities when home process crashes
Merge commit 'a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp

* commit 'a4fd0078d138b433d2250a74833ee3cc6424143a':
  Clear preferred activities when home process crashes
2010-07-30 08:45:05 -07:00
Mattias Larsson
a4fd0078d1 Clear preferred activities when home process crashes
If the "default" Home application has been replaced with
a third-party app that is repeatedly crashing at start-up,
there is no way for the user to clear the preferred activities
or uninstall the bad application. If we clear the package
preferred activities when the application crashes, the user
will be prompted with the ResolverActivity at the next boot
and can try using the app again or choose to use another
Home application.

Change-Id: I8ba8e95e6752916d50515d96c117d3084fa980fd
2010-07-30 08:36:42 -07:00
Brad Fitzpatrick
8b67752c82 am 931ee98c: am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Merge commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5'

* commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5':
  Cap the size of StrictMode buffering we do before calling DropBox.
2010-07-27 18:39:21 -07:00
Brad Fitzpatrick
931ee98cc0 am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread
Merge commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea' into gingerbread-plus-aosp

* commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea':
  Cap the size of StrictMode buffering we do before calling DropBox.
2010-07-27 18:37:20 -07:00
Brad Fitzpatrick
e73eb53125 Cap the size of StrictMode buffering we do before calling DropBox.
Change-Id: I46ea767bd0153c745e9b7eff945dacf5130f8807
2010-07-27 16:54:39 -07:00
Dianne Hackborn
9fb0bb8292 am b6022e3d: am 14bfa398: Infrastructure to report running services to developer.
Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.
2010-07-26 12:30:19 -07:00
Dianne Hackborn
b6022e3d50 am 14bfa398: Infrastructure to report running services to developer.
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
2010-07-26 12:24:57 -07:00
Dianne Hackborn
14bfa398a4 Infrastructure to report running services to developer.
Change-Id: Id1aae61323e7b8357c5fcc4bc641aaa57f3b6fde
2010-07-24 20:07:17 -07:00
Jean-Baptiste Queru
1b57b86dcc am 83a23630: am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit '83a236303438453740d5db41b0d017be9e5d56c1'

* commit '83a236303438453740d5db41b0d017be9e5d56c1':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:18:35 -07:00
Jean-Baptiste Queru
83a2363034 am dd299046: Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Merge commit 'dd29904638fb36cd5585560e83367d1f5565cc4c' into gingerbread-plus-aosp

* commit 'dd29904638fb36cd5585560e83367d1f5565cc4c':
  frameworks/base: Implement Mutual exclusion in BroadcastReceiver
2010-07-22 16:14:18 -07:00
Vairavan Srinivasan
61f07659fe frameworks/base: Implement Mutual exclusion in BroadcastReceiver
Invoke forceStopPackageLocked after acquiring a lock on
ActivityManagerService.this.

Change-Id: I75a85da03418a87c26b89360cebd3bccc6a25e46
2010-07-22 13:36:40 -07:00
The Android Open Source Project
57339e752c am e9e04673: merge from open-source master
Merge commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530'

* commit 'e9e046733dc1ce9116a55aa3a675b91f2fc2b530':
  replaced deprecated setButton Methods
2010-07-21 08:13:02 -07:00
The Android Open Source Project
e9e046733d merge from open-source master
Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
2010-07-21 08:05:45 -07:00
Christian Mehlmauer
7664e20927 replaced deprecated setButton Methods
Change-Id: I8361377cda18ae060a53b84702a2cf9b6f3e8365
2010-07-20 08:46:17 +02:00
Brad Fitzpatrick
74446cef55 am f96c2719: am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into gingerbread
Merge commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7'

* commit 'f96c2719c3cb4878e899b6fe0753b4f4b8aea8b7':
  StrictMode: batch drop box writes for system apps
2010-07-15 23:05:44 -07:00
Brad Fitzpatrick
ad13b9807b StrictMode: batch drop box writes for system apps
Change-Id: Iab49c15ecccefea1d36d86271e1ceb37d79e9449
2010-07-15 13:18:05 -07:00
Andy McFadden
824c510752 Allow "am" to initiate heap dumps.
This was mostly cloned from the "am profile" implementation.  It's
intended to replace the old "kill -10" approach used by "runhat".

We could really use a native heap dump, so I pass a "managed"
flag through that indicates whether we want to dump the native or
managed heap.  We don't currently have a native heap dump-to-file
function, so it currently just logs a warning.

(android.ddm.DdmHandleNativeHeap.getLeakInfo is a good start -- it
copies /proc/maps and then calls get_malloc_leak_info to get some
goodies.  Needs some formatting to make it human-readable.  I didn't
want to cram all that into this change.)

It would be useful if "am" didn't exit until the heap dump operation
completed, but I'm not sure how to do that.

Bug 2759474.

Change-Id: I46bc98067738d8c72ac0fc10002ca67bb4929271
2010-07-12 13:35:14 -07:00
Christopher Tate
160edb3645 Add ability to guard a thread against setting its own prio to bg
The guard is compiled out by default because it adds overhead to
android.os.Process.setPriority().

Change-Id: Ibb2a648c6349b381abb7ae62a358888b04fba871
2010-06-30 18:25:01 -07:00
Christopher Tate
c27181c7f3 Remove memory monitoring from the system watchdog
This was originally written as an in-case-we-need-it facility, but was
never actually used in production.  It also soaked up a surprising amount
of cpu on occasion, as well as doing sketchy things like demoting the
system_server's primary looper thread to the background cgroup at times.

Change-Id: I9a81a8d1e9caea9e0a1277d97785fe96add438d7
2010-06-30 14:53:39 -07:00
Dianne Hackborn
50dc3bca5a Refactor ActivityManagerService activity stack.
Introdude a new ActivityStack class that holds all of the
state and management of a stack of activities.  Paves the way
for having multiple activity stacks, though at this point
there should be no change in functionality and the activity
manager is still assuming there is only one stack.

Change-Id: Iea4859a24c9269061043755ec58a615028d4183b
2010-06-25 13:07:21 -07:00
Dianne Hackborn
9d39d0cb36 Make bad notifications crash their application.
Implement notification manager handling of bad notifications, to
call a new activity manager to have the owner's process crashed
(if there is one).

Change-Id: Ib15e8d0c598756f3b39c99cc2045c18e054daf6b
2010-06-24 17:27:28 -07:00
Dianne Hackborn
01e4cfc47d Some ActivityThread/ActivityManager cleanup.
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
  represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
  package scoped.

Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
2010-06-24 15:20:48 -07:00