Mike Lockwood
58d2139b46
am edff6dbe: Merge "Switch from hardware_legacy to new HAL GPS interface." into kraken
2010-04-05 12:36:43 -07:00
Mike Lockwood
edff6dbe5b
Merge "Switch from hardware_legacy to new HAL GPS interface." into kraken
2010-04-05 12:30:32 -07:00
Mike Lockwood
b7ff4574b5
Switch from hardware_legacy to new HAL GPS interface.
...
Change-Id: I19b299fbcbd44d711a64ece98955d095eb9ffa2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-05 15:24:34 -04:00
San Mehat
8839544ebb
am d32de7f3: am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
2010-04-05 10:53:58 -07:00
San Mehat
d32de7f38f
am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
...
Merge commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7' into kraken
* commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7':
NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
2010-04-05 10:44:45 -07:00
San Mehat
9d782f62de
am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
...
Merge commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386' into froyo-plus-aosp
* commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386':
NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
2010-04-05 10:41:19 -07:00
San Mehat
73a8f26aef
Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
2010-04-05 10:35:56 -07:00
Christopher Tate
cb41db43dd
am db4b80dd: am 11f759cf: am 5923c971: Fix \'dumpsys backup\'
2010-04-05 08:51:39 -07:00
Christopher Tate
db4b80dda0
am 11f759cf: am 5923c971: Fix \'dumpsys backup\'
...
Merge commit '11f759cf9a2b585c57adf4833ba706fd94e06571' into kraken
* commit '11f759cf9a2b585c57adf4833ba706fd94e06571':
Fix 'dumpsys backup'
2010-04-04 17:58:51 -07:00
Christopher Tate
11f759cf9a
am 5923c971: Fix \'dumpsys backup\'
...
Merge commit '5923c9718390bf6d50c52661263f15c1f863012b' into froyo-plus-aosp
* commit '5923c9718390bf6d50c52661263f15c1f863012b':
Fix 'dumpsys backup'
2010-04-04 17:56:35 -07:00
Christopher Tate
5923c97183
Fix 'dumpsys backup'
...
"for (Type foo : mSetOfType)" doesn't work when mSetOfType is null.
Change-Id: Iac667c7309f99b12d3147830e166b542b29cba5f
2010-04-04 17:45:35 -07:00
Mike Lockwood
00b74270c9
Move files internal to LocationManagerService from framework.jar to services.jar
...
Change-Id: Iebbfc49b8300ab59730733efdf489ec87ea45a25
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-04 18:44:05 -04:00
Christopher Tate
0ed99fc0b3
am a9d07713: am 5fe7b409: am 1484b6d6: Merge "Fix "incall in landscape sometimes" bug #2523942 " into froyo
2010-04-02 19:31:05 -07:00
Christopher Tate
a9d0771377
am 5fe7b409: am 1484b6d6: Merge "Fix "incall in landscape sometimes" bug #2523942 " into froyo
...
Merge commit '5fe7b4094791b898f8ffcc166c621a2bc5b05c1e' into kraken
* commit '5fe7b4094791b898f8ffcc166c621a2bc5b05c1e':
Fix "incall in landscape sometimes" bug #2523942
2010-04-02 19:22:51 -07:00
Christopher Tate
5fe7b40947
am 1484b6d6: Merge "Fix "incall in landscape sometimes" bug #2523942 " into froyo
...
Merge commit '1484b6d6b75e13dd96b0f47158926d7989808272' into froyo-plus-aosp
* commit '1484b6d6b75e13dd96b0f47158926d7989808272':
Fix "incall in landscape sometimes" bug #2523942
2010-04-02 19:18:09 -07:00
Christopher Tate
1484b6d6b7
Merge "Fix "incall in landscape sometimes" bug #2523942 " into froyo
2010-04-02 19:14:58 -07:00
Christopher Tate
b696aee7b3
Fix "incall in landscape sometimes" bug #2523942
...
The problem turns out to have been a deep weirdness in the way that keyguard
and incall interact. Incall gets relaunched when the keyboard is opened/closed,
which transiently exposes keyguard with its nosensor orientation demands, and
that plus the long keyguard-hide animation was leaving incall in a bad state
from which the window manager didn't try to recover.
We now disregard animating-towards-hidden windows [i.e. keyguard] when running
through the app tokens to determine what orientation should be, and do not do
configuration calculations at all while the display is frozen. There can still
be a transient state in which incall is drawn in landscape, but things proceed
from there to relaunch it back into the proper portrait orientation, and it
ends up in the right state in the end.
Change-Id: I0d74ee19064b6d7f65600976f1b5b16b7ec36f31
2010-04-02 19:13:51 -07:00
Irfan Sheriff
4de5b61bb0
am db83a6f5: am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo
2010-04-02 13:05:04 -07:00
Suchi Amalapurapu
9a7310e68d
am 5130073d: am 21f15f68: am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo
2010-04-02 13:05:01 -07:00
Irfan Sheriff
db83a6f56c
am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo
...
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken
* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
Dont start wifi if in airplane mode
2010-04-02 12:53:49 -07:00
Suchi Amalapurapu
5130073d17
am 21f15f68: am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo
...
Merge commit '21f15f68c2940a87954d9889e208ffbbed2c1995' into kraken
* commit '21f15f68c2940a87954d9889e208ffbbed2c1995':
Handle exceptions when doing dexopt.
2010-04-02 12:53:45 -07:00
Irfan Sheriff
90bd943364
am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo
...
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp
* commit '9c50996b175a1ee4b0069cba5163310c0189ac36':
Dont start wifi if in airplane mode
2010-04-02 12:51:05 -07:00
Suchi Amalapurapu
21f15f68c2
am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo
...
Merge commit 'a77acab9c623a8b63b46d14686cf1a86dd863289' into froyo-plus-aosp
* commit 'a77acab9c623a8b63b46d14686cf1a86dd863289':
Handle exceptions when doing dexopt.
2010-04-02 12:51:01 -07:00
Irfan Sheriff
9c50996b17
Merge "Dont start wifi if in airplane mode" into froyo
2010-04-02 12:47:45 -07:00
Suchi Amalapurapu
a77acab9c6
Merge "Handle exceptions when doing dexopt." into froyo
2010-04-02 12:46:38 -07:00
Irfan Sheriff
60e3ba071d
Dont start wifi if in airplane mode
...
Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.
Bug: 2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
2010-04-02 12:43:04 -07:00
San Mehat
be23fba286
NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
...
Change-Id: I1d6816c9754801504a988802118a2167e0eb8690
Signed-off-by: San Mehat <san@google.com>
2010-04-02 11:50:27 -07:00
Daniel Sandler
891f4ba9ec
am e21dd4ed: am 750edffb: am 25642f0b: Merge "Make desk mode work again." into froyo
2010-04-02 11:12:16 -07:00
Daniel Sandler
e21dd4edbb
am 750edffb: am 25642f0b: Merge "Make desk mode work again." into froyo
...
Merge commit '750edffbc0fe528b93097f9ce909f446540cfff5' into kraken
* commit '750edffbc0fe528b93097f9ce909f446540cfff5':
Make desk mode work again.
2010-04-02 11:03:13 -07:00
Daniel Sandler
750edffbc0
am 25642f0b: Merge "Make desk mode work again." into froyo
...
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp
* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
Make desk mode work again.
2010-04-02 10:59:41 -07:00
Daniel Sandler
25642f0b16
Merge "Make desk mode work again." into froyo
2010-04-02 10:54:57 -07:00
Daniel Sandler
8daf2a4799
Make desk mode work again.
...
Bug: 2564612
Change-Id: I858a86d14a6840f5f587343a64c5d0c4bc5d5263
2010-04-02 10:15:09 -04:00
Suchi Amalapurapu
73dafa1f66
Handle exceptions when doing dexopt.
...
Change-Id: Iaeba98ef9fef2f1dbf3dbe2e8e4497dae8d0fe7f
2010-04-01 21:02:21 -07:00
Robert Greenwalt
a6dfa15e64
am 4e925f8a: am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
2010-04-01 10:36:05 -07:00
Robert Greenwalt
4e925f8afb
am cab133a7: am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
...
Merge commit 'cab133a7fa39969f136e3f401f97f6ce843514bb' into kraken
* commit 'cab133a7fa39969f136e3f401f97f6ce843514bb':
NetworkManagementService: Add interface counters & throttle API
2010-04-01 10:27:04 -07:00
Robert Greenwalt
cab133a7fa
am 33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
...
Merge commit '33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp
* commit '33eb7767fb49482643df80c8b5567da83aa0e49f':
NetworkManagementService: Add interface counters & throttle API
2010-04-01 10:22:51 -07:00
San Mehat
91cac64cd0
NetworkManagementService: Add interface counters & throttle API
...
Change-Id: I4976549cdbb027ba7859335e69bf866e738961c9
Signed-off-by: San Mehat <san@google.com>
2010-04-01 08:34:20 -07:00
Dianne Hackborn
c1c1d63e05
am d0b5b3cb: am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791 : Expose API to go in to car mode." into froyo
2010-03-31 23:34:16 -07:00
Dianne Hackborn
9fa763c503
am aa3bbe9c: am 025f3933: am 686f7911: Merge "Fix issue #2561067 : Screen Display half faded..." into froyo
2010-03-31 23:34:13 -07:00
Suchi Amalapurapu
081e7a2716
am 392be3fa: am 1aa64b53: am ae18171a: Change certificate policy.
2010-03-31 23:33:59 -07:00
Dianne Hackborn
d0b5b3cb61
am 2d8d4d7b: am 513ae361: Merge "Fix issue #2560791 : Expose API to go in to car mode." into froyo
...
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken
* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
Fix issue #2560791 : Expose API to go in to car mode.
2010-03-31 23:23:16 -07:00
Dianne Hackborn
aa3bbe9c9f
am 025f3933: am 686f7911: Merge "Fix issue #2561067 : Screen Display half faded..." into froyo
...
Merge commit '025f3933cfc21655bfc5a5068c69303f1fe321ee' into kraken
* commit '025f3933cfc21655bfc5a5068c69303f1fe321ee':
Fix issue #2561067 : Screen Display half faded...
2010-03-31 23:23:10 -07:00
Suchi Amalapurapu
392be3fa3d
am 1aa64b53: am ae18171a: Change certificate policy.
...
Merge commit '1aa64b53eb9b3cc7904705076a015a5cd0e3b536' into kraken
* commit '1aa64b53eb9b3cc7904705076a015a5cd0e3b536':
Change certificate policy.
2010-03-31 23:22:56 -07:00
Dianne Hackborn
2d8d4d7b16
am 513ae361: Merge "Fix issue #2560791 : Expose API to go in to car mode." into froyo
...
Merge commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp
* commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
Fix issue #2560791 : Expose API to go in to car mode.
2010-03-31 23:18:28 -07:00
Dianne Hackborn
025f3933cf
am 686f7911: Merge "Fix issue #2561067 : Screen Display half faded..." into froyo
...
Merge commit '686f7911a3462d6847d2a9396572eaaf04a9f175' into froyo-plus-aosp
* commit '686f7911a3462d6847d2a9396572eaaf04a9f175':
Fix issue #2561067 : Screen Display half faded...
2010-03-31 23:18:24 -07:00
Suchi Amalapurapu
1aa64b53eb
am ae18171a: Change certificate policy.
...
Merge commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad' into froyo-plus-aosp
* commit 'ae18171acd3c70fc6d27fc6bbe85828e0f928fad':
Change certificate policy.
2010-03-31 23:18:12 -07:00
Dianne Hackborn
513ae3610e
Merge "Fix issue #2560791 : Expose API to go in to car mode." into froyo
2010-03-31 23:03:26 -07:00
Dianne Hackborn
686f7911a3
Merge "Fix issue #2561067 : Screen Display half faded..." into froyo
2010-03-31 22:49:30 -07:00
Dianne Hackborn
f83c555d8a
Fix issue #2561067 : Screen Display half faded...
...
Also a little tweak to the activity manager to behave better when
an application crash, to hopefully mostly avoid situations where
you get into a crash loop.
Change-Id: I627cc1da3a0f16a180957f02bfbe5c81ecd31758
2010-03-31 22:47:10 -07:00
Suchi Amalapurapu
ae18171acd
Change certificate policy.
...
The certificates of the package and its shared user certificates
are initialized only when installing the package.
When scanning the packages, the certificates are collected from the apk
if the time stamp changes. If not the one's from
PackageSetting(read from packages.xml) are reused.
Removed mergeSignatures and updateSignatures since we don't support
this any more.
Also fix some bugs related to reinstalling failed upgrades.
Some unit tests.
Change-Id: Ibdeff170bd386d723f774136b18e0ad59d9cdabb
2010-03-31 19:58:25 -07:00