Robert Greenwalt
8817ad92dd
am b049ab29: am 82052192: am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
2010-04-10 11:58:40 -07:00
Robert Greenwalt
82052192c5
am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
...
Merge commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b' into kraken
* commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b':
Make ThrottleService notice policy changes.
2010-04-10 11:47:35 -07:00
Robert Greenwalt
090af2c570
am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
...
Merge commit '4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp
* commit '4dceedc133ef0487577badb67100d20473d87762':
Make ThrottleService notice policy changes.
2010-04-10 11:41:25 -07:00
Robert Greenwalt
81aa0971d7
Make ThrottleService notice policy changes.
...
Added ContentObserver to watch relevant Secure Settings.
Also added new policy-change broadcast to let settings know.
Lastly reorged things a bit so that all of our broadcasts are sent at boot so the sticky ones
are populated.
bug:2576057
Change-Id: Ie11ffb057de9c801a5088612cd464ea062f3a666
2010-04-09 12:42:45 -07:00
Robert Greenwalt
f70c9f2db2
am 49267612: am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
2010-04-09 09:44:14 -07:00
Robert Greenwalt
061cd6e322
am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
...
Merge commit 'a68780dd0f0af0938b72fdf6539db575da471028' into kraken
* commit 'a68780dd0f0af0938b72fdf6539db575da471028':
Roaming data doesn't count against limits
2010-04-09 09:35:55 -07:00
Robert Greenwalt
a68780dd0f
am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
...
Merge commit 'cb27041034343a6a15f0812d04f66fefbed30686' into froyo-plus-aosp
* commit 'cb27041034343a6a15f0812d04f66fefbed30686':
Roaming data doesn't count against limits
2010-04-09 09:32:03 -07:00
Irfan Sheriff
d2220bd4cd
am eaec9f2e: am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins
2010-04-09 08:51:19 -07:00
Robert Greenwalt
5f996899b0
Roaming data doesn't count against limits
...
bug:2576057
Change-Id: I51a66e3b49a62e0186816ec0473814a216184e6b
2010-04-08 19:12:38 -07:00
Irfan Sheriff
d99540d7a2
am 750f3211: am c9b6851a: Throttling framework addins
...
Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken
* commit '750f32117b96a8af4fb03fae459a80f79a667fca':
Throttling framework addins
2010-04-08 17:05:06 -07:00
Irfan Sheriff
750f32117b
am c9b6851a: Throttling framework addins
...
Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp
* commit 'c9b6851af68bdc20c4903b16c344e9f116647219':
Throttling framework addins
2010-04-08 17:01:59 -07:00
Jeff Brown
182a2f380f
am 5a8a507c: am b059dc9c: am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
2010-04-08 16:54:41 -07:00
Jeff Brown
5fff8b2e1a
am 51fb09d9: am cebd1e94: am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:54:37 -07:00
Irfan Sheriff
c9b6851af6
Throttling framework addins
...
Add ThrottleManager in getSystemService
Add API for URL fetch
Bug: 2576057
Change-Id: Icd25c8b91ea4beea15c74e8ad7292ab48c962253
2010-04-08 16:53:32 -07:00
Jeff Brown
b059dc9c89
am b00771aa: am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
...
Merge commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b' into kraken
* commit 'b00771aa806e9fd43669f09e8c348f2b4457ca0b':
Workaround NPE caused by packages missing signatures.
2010-04-08 16:47:19 -07:00
Jeff Brown
cebd1e9468
am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
...
Merge commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0' into kraken
* commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0':
Improve robustness of package manager certificate collection.
2010-04-08 16:47:15 -07:00
Jeff Brown
b00771aa80
am 267f0a6b: Merge "Workaround NPE caused by packages missing signatures." into froyo
...
Merge commit '267f0a6b683a2de75450afee59d2058b292c72c8' into froyo-plus-aosp
* commit '267f0a6b683a2de75450afee59d2058b292c72c8':
Workaround NPE caused by packages missing signatures.
2010-04-08 16:44:40 -07:00
Jeff Brown
6742a0c9cc
am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo
...
Merge commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed' into froyo-plus-aosp
* commit '779a4ca84d62a6e4f18a723cfc18c5d035f60fed':
Improve robustness of package manager certificate collection.
2010-04-08 16:44:37 -07:00
Jeff Brown
267f0a6b68
Merge "Workaround NPE caused by packages missing signatures." into froyo
2010-04-08 16:41:47 -07:00
Jeff Brown
779a4ca84d
Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:41:37 -07:00
Robert Greenwalt
673a2f6273
am b2216375: am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:30:55 -07:00
Robert Greenwalt
da0498c598
am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken
* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
Updating some notificiation UI for Throttling
2010-04-08 16:25:54 -07:00
Robert Greenwalt
6cf3d4aa76
am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp
* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
Updating some notificiation UI for Throttling
2010-04-08 16:18:31 -07:00
Robert Greenwalt
c87dc6dc90
Updating some notificiation UI for Throttling
...
String update and make one an ongoing notification.
bug:2576057
Change-Id: I7980f110c7eed8e8bf305490eddaa58e2949e3be
2010-04-08 16:00:26 -07:00
Jeff Brown
e684d9582c
Workaround NPE caused by packages missing signatures.
...
Bug: b/2547993
Change-Id: Idcd4fc3ee4c2560a00a952e1910a50b30b736114
2010-04-08 14:05:11 -07:00
Robert Greenwalt
ac6ec41b67
resolved conflicts for merge of 4e33e9c1 to master
...
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
2010-04-08 13:54:58 -07:00
Jeff Brown
e760072a98
Improve robustness of package manager certificate collection.
...
The package manager contains an optimization which reuses cached
signatures instead of reloading them on startup if the package
appears to be unchanged. This commit adds an extra check to ensure
that the PackageSettings object actually has valid signatures since
it has happened that they have gone missing. Unfortunately it does
not address the root cause of the problem but it should alleviate the
symptoms after a reboot.
Bug: b/2547993
Change-Id: I41900c6a752711eb3a901360e3bb29aec946d0be
2010-04-08 13:49:17 -07:00
Robert Greenwalt
6646cf7af9
am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
...
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken
* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Robert Greenwalt
6f72a313a0
am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
...
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp
* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Robert Greenwalt
9e696c29f0
Add service to monitor/control the flow of data.
...
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
2010-04-08 12:34:45 -07:00
The Android Open Source Project
260fc5f9e4
am 5e78c1f4: am c9522c95: am 727cec02: merge from open-source master
2010-04-08 11:45:17 -07:00
The Android Open Source Project
c9522c95ef
am 727cec02: merge from open-source master
...
Merge commit '727cec02daa66b5e984aff277185d503fabe5d51' into kraken
* commit '727cec02daa66b5e984aff277185d503fabe5d51':
Fix reporting of window visibility in WindowManagerService.
2010-04-08 11:39:51 -07:00
The Android Open Source Project
727cec02da
merge from open-source master
...
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
2010-04-08 11:35:37 -07:00
Dianne Hackborn
40e8b1de9a
am 48357eee: am b921b37b: am a327dbdd: am ecb0e637: Fix issue #2541849 : System crash when an app with active notifications...
2010-04-07 22:48:22 -07:00
Dianne Hackborn
b921b37b1c
am a327dbdd: am ecb0e637: Fix issue #2541849 : System crash when an app with active notifications...
...
Merge commit 'a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken
* commit 'a327dbddccb002919b98bdfd7abd81619826a3b8':
Fix issue #2541849 : System crash when an app with active notifications...
2010-04-07 22:42:46 -07:00
Dianne Hackborn
a327dbddcc
am ecb0e637: Fix issue #2541849 : System crash when an app with active notifications...
...
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp
* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
Fix issue #2541849 : System crash when an app with active notifications...
2010-04-07 22:39:18 -07:00
Dianne Hackborn
ecb0e63787
Fix issue #2541849 : System crash when an app with active notifications...
...
...in status bar is installed on sdcard and device is powered down.
Don't do the GC until everyone has had a chance to take care of external
storage going away.
This is more correct, but doesn't completely fix the problem that
appears when shutting down.
Change-Id: I24b19337ba6262cfd8d010645dbf67e76ea03058
2010-04-07 22:19:55 -07:00
Suchi Amalapurapu
4baf4e6a74
am eb606ec9: am 3e543abb: am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:40:29 -07:00
Suchi Amalapurapu
3e543abbc1
am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
...
Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken
* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
Fix 2579461
2010-04-07 21:32:30 -07:00
Suchi Amalapurapu
a599469f90
am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
...
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp
* commit 'c2461be6279137f872becf695befeb7ba8770a64':
Fix 2579461
2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
c2461be627
Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
2010-04-07 21:24:36 -07:00
Suchi Amalapurapu
40e472521a
Fix 2579461
...
Move install location values to secure settings.
Diable attribute for UI. Set default value to auto.
Add command line interface to set install location via pm.
Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
2010-04-07 20:43:54 -07:00
Dianne Hackborn
64c660ccd8
am 2b973a6b: am 90dd6462: am 48879933: am 390022b2: Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
2010-04-07 18:43:08 -07:00
Dianne Hackborn
90dd6462db
am 48879933: am 390022b2: Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
...
Merge commit '4887993381af1068cb0c68b4eca29ed83ebf47bd' into kraken
* commit '4887993381af1068cb0c68b4eca29ed83ebf47bd':
Fix issue #2528537 : android.os.DeadObjectException
2010-04-07 18:37:12 -07:00
Dianne Hackborn
4887993381
am 390022b2: Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
...
Merge commit '390022b23b2c53119ff0bde4b14d14728bc48bb2' into froyo-plus-aosp
* commit '390022b23b2c53119ff0bde4b14d14728bc48bb2':
Fix issue #2528537 : android.os.DeadObjectException
2010-04-07 18:33:23 -07:00
Dianne Hackborn
390022b23b
Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
2010-04-07 18:31:06 -07:00
John Wang
ada88000c9
am cdb60148: am 90f2a71e: am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
2010-04-07 18:06:57 -07:00
John Wang
90f2a71e1e
am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
...
Merge commit '7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken
* commit '7ecf08faa9da7d372dd319aac8b1e5760a116601':
Add emergencyOnly indicator in ServiceState.
2010-04-07 17:58:53 -07:00
John Wang
7ecf08faa9
am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
...
Merge commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp
* commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656':
Add emergencyOnly indicator in ServiceState.
2010-04-07 17:54:27 -07:00
John Wang
815b8e4ac4
Merge "Add emergencyOnly indicator in ServiceState." into froyo
2010-04-07 17:51:41 -07:00