Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,875 Commits 3 Branches 0 Tags
97ac293507bfa2913e115f736df3dfd91230a232
Commit Graph

677 Commits

Author SHA1 Message Date
Jim Miller
578e73dac8 am 6687ecb4: Merge "Fix 3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread 
* commit '6687ecb447025a1c56253d0fd67ad30af070db17':
  Fix 3106227: use WeakReferences for receivers in DigitalClock class
 2011-01-16 16:16:57 -08:00
Jim Miller
8b886fab54 Fix 3106227: use WeakReferences for receivers in DigitalClock class 
This works around a bug in the framework where LockScreen wouldn't
get GC'd under certain circumstances which would lead to an OOM
crash.  It now uses WeakReferences for observers inside the
DigitalClock container class and unregisters them if the containing
DigitalClock goes away.

Also removed mLive variable which was unused and could potentially
leak the receivers.

Left mAttached for debugging so we can use it to determine if the
calls to onAttachToWindow() and onDetachFromWindow() are grossly
unbalanced which may be the root cause of the original problem.

Have cleanUp() explicitly clear unused references to make
tracing through hprof references easier.

Change-Id: I99a7e0c356001b05eab5aa729564553666febfea
 2011-01-14 18:01:12 -08:00
Dianne Hackborn
97b0b7bbd4 am 3ea5728e: Tweak level at which we reset battery stats to 90%. 
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
  Tweak level at which we reset battery stats to 90%.
 2011-01-06 20:28:44 -08:00
Dianne Hackborn
3ea5728e70 Tweak level at which we reset battery stats to 90%. 
Change-Id: I81151809100912c7956536d5d47279d2c2fea8c4
 2011-01-05 19:14:53 -08:00
Dianne Hackborn
78e9f4cbae am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
 2010-12-13 14:37:09 -08:00
Dianne Hackborn
e4a5951925 Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
Includes some other small fixes to battery collection and a few
other things.

Output of package info looks like this:

5,0,i,uid,1000,com.android.settings
5,0,i,uid,1000,com.android.providers.subscribedfeeds
5,0,i,uid,1000,com.android.providers.settings
5,0,i,uid,1000,com.android.server.vpn
5,0,i,uid,1000,android
5,0,i,uid,1000,com.android.systemui
5,0,i,uid,1000,com.google.android.backup
5,0,i,uid,1001,com.android.phone
5,0,i,uid,1001,com.android.providers.telephony
5,0,i,uid,1022,com.android.nfc
5,0,i,uid,10021,com.google.android.location
5,0,i,uid,10021,com.google.android.syncadapters.calendar
5,0,i,uid,10021,com.google.android.gsf
5,0,i,uid,10021,com.google.android.syncadapters.contacts
5,0,i,uid,10026,com.android.providers.downloads.ui
5,0,i,uid,10026,com.android.providers.media
5,0,i,uid,10026,com.android.providers.drm
5,0,i,uid,10026,com.android.providers.downloads
5,0,i,uid,10032,com.android.launcher
5,0,i,uid,10039,com.google.android.gm
5,0,i,uid,10041,com.google.android.gallery3d
5,0,i,uid,10049,com.android.providers.calendar

Change-Id: I9e38f254eef146339113ad270f5c6e8b60fb7a1d
 2010-12-13 14:31:40 -08:00
Dianne Hackborn
c4b7088f19 am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 
* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
  Add more checks for bad values to protect from corrupt files.
 2010-12-07 22:07:40 -08:00
Dianne Hackborn
7b9c56fe0f Add more checks for bad values to protect from corrupt files. 
Change-Id: I4174c358c49b93e74920b00fcfd6c68659bf7d08
 2010-12-07 22:02:59 -08:00
Jean-Baptiste Queru
12902d687f resolved conflicts for merge of 78742e01 to stage-korg-master 
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
 2010-12-07 12:51:49 -08:00
Hakan Gustavsson
dea74b0285 Strings for NI position request are moved to resources 
The strings used by the framework for network initiated position
requests are now string resources that can be properly localized.

Change-Id: If1cba89adb1bfcb9c8fdb59b9c5aa1107b11279e
 2010-12-03 09:47:21 +01:00
Dianne Hackborn
63f40387d9 am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread 
* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
  Fix issue #3177284: Account for wake lock power usage on Crespo
 2010-11-10 18:01:21 -08:00
Dianne Hackborn
0c8b4d3f7e Fix issue #3177284: Account for wake lock power usage on Crespo 
Change-Id: I5e3d6c4772f08277ee775dba191a5054dd5a4ca2
 2010-11-08 19:10:58 -08:00
Nick Pelly
6fb9316f6b am 38e561dd: Merge "Remove timeout support." into gingerbread 
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
  Remove timeout support.
 2010-11-02 14:49:35 -07:00
Nick Pelly
275708c82c Remove timeout support. 
The implementation was guarenteed to cause deadlock when a timeout was set.

Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-11-02 16:13:52 -05:00
Andy McFadden
e3e8642ce4 am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:25:29 -07:00
Andy McFadden
1b4c7966b1 Set capabilities sooner. 
Bug 3135433.

Change-Id: I4e34b60c0a01b85ce0d80eb96ff3510604a68c71
 2010-10-27 11:26:05 -07:00
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden. 
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
 2010-10-26 08:59:18 -05:00
Dianne Hackborn
2f1eee3470 am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread 
Merge commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp

* commit 'e9dbf208e4f72b41dc3961d9d4570d5b69126307':
  Fix issue #3117472: Format storage dialog still broken
 2010-10-21 17:35:12 -07:00
Dianne Hackborn
4f6ee254bc Fix issue #3117472: Format storage dialog still broken 
Change-Id: I19b3a04e33785a56cb14457e4e3cd9232f585bb1
 2010-10-21 16:39:53 -07:00
Dianne Hackborn
153bf6c8d7 am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp

* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-20 14:10:29 -07:00
Dianne Hackborn
266e607bde Fix issue #3113424: Battery stats don't reset on Crespo 
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
 2010-10-20 12:26:48 -07:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread 
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
 2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 12:25:46 -07:00
Joe Onorato
bdf1706ac6 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00
Joe Onorato
431bb22695 Reduce logging. 
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
 2010-10-19 15:08:05 -04:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier. 
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
 2010-10-19 11:02:20 -07:00
Nick Pelly
774b943fc6 am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc. 
Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp

* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
 2010-10-17 17:50:20 -07:00
Nick Pelly
d1f7f4a683 Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc. 
Change-Id: I9bb67de2956b1ecb765ca4ac142ed9455060bec4
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-17 16:30:40 -07:00
Dianne Hackborn
964eb4389b am 42499170: Implement issue #3094621 and #3094609 - wipe sd card 
Merge commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0' into gingerbread-plus-aosp

* commit '424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0':
  Implement issue #3094621 and #3094609 - wipe sd card
 2010-10-16 16:51:13 -07:00
Dianne Hackborn
424991704b Implement issue #3094621 and #3094609 - wipe sd card 
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Also since we have decided that it is important to consider
the Crespo storage as internal storage, DevicePolicyManager
gets a new API to be able to wipe it.  (No big deal, since
all of the work for this is now done in the implementation
of the new UI.)

Change-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807
 2010-10-16 16:32:15 -07:00
Romain Guy
157fa0aca5 am 77c011ba: Set default heap size to 5MB. 
Merge commit '77c011ba75ee1403c9b7626e4676cd3c8746605b' into gingerbread-plus-aosp

* commit '77c011ba75ee1403c9b7626e4676cd3c8746605b':
  Set default heap size to 5MB.
 2010-10-15 19:23:32 -07:00
Romain Guy
77c011ba75 Set default heap size to 5MB. 
Change-Id: Iac8ae3cbe6b431767776653c9f430983172cfb6f
 2010-10-15 19:15:25 -07:00
Dianne Hackborn
13e46665ff am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread 
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp

* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
 2010-10-15 18:24:49 -07:00
Dianne Hackborn
8bdf5935c0 Work on issue #3101415: Crespo apps seem to have their UID changed over time. 
fsync!

Change-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c
 2010-10-15 14:46:33 -07:00
Brad Fitzpatrick
33476b2db8 am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread 
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp

* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
  Don't crash on null Vibrator during reboot.
 2010-10-15 08:51:01 -07:00
Brad Fitzpatrick
e331644cb5 Don't crash on null Vibrator during reboot. 
Bug: 3099305
Change-Id: I9af126f7a719f36ae544f517a2fccd0d33339389
 2010-10-14 20:53:06 -07:00
Daniel Lehmann
c61c98fdba am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread 
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp

* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts
 2010-10-14 18:34:17 -07:00
Daniel Lehmann
2f14c62125 DO NOT MERGE: Private API to pass the selected tab through QuickContacts 
Bug:3082932

Change-Id: I28dbb21a30fbe22e6e58a8dda534fc9110621c85
 2010-10-14 11:26:18 -07:00
Kenny Root
b4f26a9d37 am e6ae5c39: Merge "Add shutdown assurance" into gingerbread 
Merge commit 'e6ae5c39848d2a3a6f3fb750811550969799e410' into gingerbread-plus-aosp

* commit 'e6ae5c39848d2a3a6f3fb750811550969799e410':
  Add shutdown assurance
 2010-10-13 14:22:19 -07:00
Kenny Root
f547d679c0 Add shutdown assurance 
If something kills system_server before it completes its shutdown
action, the runtime will just restart giving the illusion that a reboot
for an OTA or something else has happened.

To prevent this, write a system property containing the reboot reason
before initiating the shutdown with all the services. If the
system_server is killed before it completes, the next time the main
thread of system_server starts up, it will immediately execute the
shutdown action.

Bug: 3022556
Change-Id: I81723bac333430f04205e7a7b799914d96f170eb
 2010-10-13 11:45:35 -07:00
Jean-Baptiste Queru
c43189e769 am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep" 
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep
 2010-10-10 18:51:43 -07:00
Dianne Hackborn
d5423321b9 am 9934fa77: Merge "Fix issue #3074745: Crash in system process" into gingerbread 
Merge commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead' into gingerbread-plus-aosp

* commit '9934fa77efab362729d0d3cb8aa0bdcd31d63ead':
  Fix issue #3074745: Crash in system process
 2010-10-08 14:12:20 -07:00
Dianne Hackborn
f47d8f272c Fix issue #3074745: Crash in system process 
Also some tweaks to battery history collection to hopefully
improve the data we have.

Change-Id: I178a54a8c2d15cf38dcceaeef939406f50059aa4
 2010-10-08 13:00:15 -07:00
Kenny Root
cfc80bd5c1 am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread 
Merge commit '2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp

* commit '2c3360fe9c03536cbfd77267170b73c120c071ac':
  Remove lingering system app native libs in /data
 2010-10-05 14:07:29 -07:00
Kenny Root
831baa2e25 Remove lingering system app native libs in /data 
If a system app had a lingering native library in /data/data/<app>/lib,
it would prefer that over the one in /system/lib due to recent changed
in the Dalvik JNI class loading code.

To "fix" that we need to check if there are any native libraries in a
/data/data/<app>/lib directory for any non-updated system apps and
delete them during scanning.

Change-Id: If3a22e41a8531e9e5a44ba001dcea46253d47d45
 2010-10-05 12:56:03 -07:00
Gilles Debunne
6f4f01062b am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp

* commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b':
  Removed icon in Alert dialog header.
 2010-10-04 15:48:54 -07:00
Gilles Debunne
076c7fbeda Removed icon in Alert dialog header. 
Bug 3042419

I wanted to nuke this one for ages

Change-Id: I079bec9b31157d6b7887c4f22612e56ae9690e7c
 2010-10-04 12:00:02 -07:00
Kenny Root
aff30c9b0d am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread 
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp

* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
  Fix location of gdbserver upon installation
 2010-09-30 14:30:14 -07:00
Kenny Root
e6da118ebf Fix location of gdbserver upon installation 
Change-Id: Ie97f10456e5639e008abf4792a01b966b97721e7
 2010-09-30 14:13:59 -07:00