21166 Commits

Author SHA1 Message Date
Suchi Amalapurapu
1a456c142b am 728e4cc8: am e6fdab7f: am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 12:42:22 -07:00
Irfan Sheriff
656a66c364 am b6f7123b: am 7eeb44f2: am b2e6c01f: Disable tethering when airplane mode is enabled 2010-04-06 12:38:20 -07:00
Suchi Amalapurapu
728e4cc88f am e6fdab7f: am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit 'e6fdab7f005cc06df989c97907c3cc3060692121' into kraken

* commit 'e6fdab7f005cc06df989c97907c3cc3060692121':
  Forcibly unmount the sdcard after N retries.
2010-04-06 11:00:08 -07:00
Suchi Amalapurapu
e6fdab7f00 am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp

* commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
  Forcibly unmount the sdcard after N retries.
2010-04-06 10:55:43 -07:00
Irfan Sheriff
b6f7123bd6 am 7eeb44f2: am b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit '7eeb44f20527caaad618e28ba511e7661f5904cb' into kraken

* commit '7eeb44f20527caaad618e28ba511e7661f5904cb':
  Disable tethering when airplane mode is enabled
2010-04-06 10:52:52 -07:00
Suchi Amalapurapu
fede9aed2b Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 10:50:56 -07:00
Irfan Sheriff
7eeb44f205 am b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp

* commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6':
  Disable tethering when airplane mode is enabled
2010-04-06 10:48:46 -07:00
Irfan Sheriff
b2e6c01f44 Disable tethering when airplane mode is enabled
Tethering should be disabled when
airplane mode is enabled. Additionally,
we should restore Wifi (if it was on
before tethering was enabled) when
airplane mode is disabled.

Bug: 2567099
Change-Id: Iba2031f5ecb207954fd155c47134b39ed0167fa0
2010-04-06 10:35:27 -07:00
Suchi Amalapurapu
7af074a612 Forcibly unmount the sdcard after N retries.
Don't rely on the ActivityManager's reported status about killing the
storage user process since the process might have gone away in between.

Change-Id: Ia7fa43eb34553329e7ff611ab6b99375b5ae673a
2010-04-06 10:02:34 -07:00
Bjorn Bringert
0981da6951 am 792989cc: am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 09:09:49 -07:00
Joe Onorato
a05b6883b5 am e0da887e: am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 09:06:56 -07:00
Bjorn Bringert
792989cc8f am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken

* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
  Guard against NPE in SearchManagerService
2010-04-06 09:00:51 -07:00
Bjorn Bringert
16419aca40 am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp

* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
  Guard against NPE in SearchManagerService
2010-04-06 08:57:01 -07:00
Bjorn Bringert
7d2511b722 Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 08:53:12 -07:00
Joe Onorato
e0da887e64 am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken

* commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65':
  Redo the look of the recent apps switcher
2010-04-06 08:41:50 -07:00
Joe Onorato
703cb72442 am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit 'fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp

* commit 'fa588fc37420a1a4d287e6307700ca310897308a':
  Redo the look of the recent apps switcher
2010-04-06 08:36:05 -07:00
Joe Onorato
fa588fc374 Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
Joe Onorato
fd6c969c8c Redo the look of the recent apps switcher
Change-Id: I913c3f68f487e7ccf20a014c26ab85119e991484
2010-04-06 10:30:38 -05:00
Bjorn Bringert
28fe20930e Guard against NPE in SearchManagerService
Bug http://b/issue?id=2570569

Change-Id: I72395f847b3dbc699c73358e14421d624f40fcf3
2010-04-06 14:48:41 +01:00
Daisuke Miyakawa
1d707fcd2a Merge "Let vCard importer/exporter select charset. There are some other bug where charset for import/export is used during vCard handling." 2010-04-05 21:42:45 -07:00
Daisuke Miyakawa
82b8b68652 Let vCard importer/exporter select charset.
There are some other bug where charset for import/export is used during vCard handling.

Bug: 2572064
Change-Id: I0aef8a6eba0a7e9263e47368a43dbba05efa91b0
2010-04-06 13:41:27 +09:00
Dianne Hackborn
7a3a6dba21 am 5a0797a9: am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK 2010-04-05 19:02:57 -07:00
Dianne Hackborn
4931331552 am f0adaa1b: am eab92d7b: am 01f6b75b: Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo 2010-04-05 18:53:21 -07:00
Dianne Hackborn
5a0797a910 am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken

* commit 'c94dad83be792928206363cb43524a68b6a62ffe':
  2568467 System crash when installing corrupt APK
2010-04-05 18:52:39 -07:00
Dianne Hackborn
c94dad83be am 6e52b5d7: 2568467 System crash when installing corrupt APK
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp

* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
  2568467 System crash when installing corrupt APK
2010-04-05 18:45:50 -07:00
Dianne Hackborn
f0adaa1bd5 am eab92d7b: am 01f6b75b: Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo
Merge commit 'eab92d7bec5ff0d12ee68047bba4ade3afb718a7' into kraken

* commit 'eab92d7bec5ff0d12ee68047bba4ade3afb718a7':
  Fix issue #2564479: Favorite Recipes App Installation Fail
2010-04-05 18:42:27 -07:00
Dianne Hackborn
eab92d7bec am 01f6b75b: Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo
Merge commit '01f6b75baa3b9144240fa8c9772859ab4ac948bd' into froyo-plus-aosp

* commit '01f6b75baa3b9144240fa8c9772859ab4ac948bd':
  Fix issue #2564479: Favorite Recipes App Installation Fail
2010-04-05 18:39:04 -07:00
Dianne Hackborn
6e52b5d768 2568467 System crash when installing corrupt APK
Also fix another crash I just saw in the package manager, when a
permission got left around from a previous install but as no
longer defined.

Change-Id: I33b87420f0c59e24b8b77fab8b0316461d99e048
2010-04-05 18:37:57 -07:00
Dianne Hackborn
01f6b75baa Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo 2010-04-05 18:35:11 -07:00
Mathias Agopian
325d32711f am 01bd2a2f: Merge "Make pixels prettier." into kraken 2010-04-05 18:29:54 -07:00
Mathias Agopian
01bd2a2f9f Merge "Make pixels prettier." into kraken 2010-04-05 18:22:44 -07:00
Mathias Agopian
59962ce3b0 Make pixels prettier.
Change-Id: If3b0774b70cbe943894c15ffa1da111ad887010f
2010-04-05 18:12:27 -07:00
Jim Miller
032f351d84 am bc49b43b: am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:33:10 -07:00
Jim Miller
bc49b43b57 am bf81cb91: am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken

* commit 'bf81cb91aa584d3b52d807aa4134a1a90569de31':
  Fix 2325549: Allow up to 4 lines of summary text in Settings
2010-04-05 17:25:17 -07:00
Jim Miller
bf81cb91aa am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp

* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
  Fix 2325549: Allow up to 4 lines of summary text in Settings
2010-04-05 17:21:20 -07:00
Jim Miller
a6cce790b2 Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:16:00 -07:00
Dirk Dougherty
1021da0af5 am 1af31f6c: am e0143409: am bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo 2010-04-05 17:04:36 -07:00
Jim Miller
fdceefd8a2 Fix 2325549: Allow up to 4 lines of summary text in Settings
This fixes a number of screens in Settings (see the bug for examples).
Though it seems like a scary change, it should be safe since
the added line doesn't affect layout unless it's used, in which
case the view is slightly taller.

Change-Id: I13d04efadee19b407febabfae7825aedf66e8744
2010-04-05 16:53:10 -07:00
Dirk Dougherty
1af31f6cd8 am e0143409: am bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo
Merge commit 'e0143409af39e050b3137aef9baa72d86f32f8d5' into kraken

* commit 'e0143409af39e050b3137aef9baa72d86f32f8d5':
  docs: add manifest documentation for installLocation
2010-04-05 16:51:22 -07:00
Dirk Dougherty
e0143409af am bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo
Merge commit 'bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1' into froyo-plus-aosp

* commit 'bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1':
  docs: add manifest documentation for installLocation
2010-04-05 16:44:58 -07:00
Dirk Dougherty
bcbb7b2765 Merge "docs: add manifest documentation for installLocation" into froyo 2010-04-05 16:37:07 -07:00
Scott Main
c861a5d24e docs: add manifest documentation for installLocation
Change-Id: Id52e3460bd1ada86b6b32a47dd020829d65ac5f8
2010-04-05 16:09:21 -07:00
Wei Huang
0f4852fdf8 am fb8cc4d3: am 6ba03118: am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo 2010-04-05 15:55:53 -07:00
Wei Huang
fb8cc4d302 am 6ba03118: am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9' into kraken

* commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9':
  bug 2542580: fix bad icon.
2010-04-05 15:46:22 -07:00
Wei Huang
6ba0311879 am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp

* commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f':
  bug 2542580: fix bad icon.
2010-04-05 15:42:30 -07:00
Wei Huang
0abdf03d9d Merge "bug 2542580: fix bad icon." into froyo 2010-04-05 15:36:40 -07:00
Doug Zongker
5e01d01f52 am 00018822: am e725a963: am 4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo 2010-04-05 15:29:11 -07:00
Doug Zongker
0001882200 am e725a963: am 4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Merge commit 'e725a9634b0cea150b29755ed94c53e621b4f273' into kraken

* commit 'e725a9634b0cea150b29755ed94c53e621b4f273':
  remove OTA packages from the old (pre-froyo) updater
2010-04-05 15:22:59 -07:00
Doug Zongker
e725a9634b am 4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Merge commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0' into froyo-plus-aosp

* commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0':
  remove OTA packages from the old (pre-froyo) updater
2010-04-05 15:19:49 -07:00
Doug Zongker
4c59ca8bdb Merge "remove OTA packages from the old (pre-froyo) updater" into froyo 2010-04-05 15:16:12 -07:00