2326 Commits

Author SHA1 Message Date
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
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
Dianne Hackborn
9c9c532d36 Fix issue #2560791: Expose API to go in to car mode.
Also fix bug where night mode was being used in desk dock.

Change-Id: I56c1cf3d6fe800a4f986d40cc4cb2e70b76ac261
2010-03-31 16:25:53 -07:00
Jeff Brown
c254ce3ab0 am 6801cedb: am 6a3e7dfa: am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo 2010-03-31 16:14:45 -07:00
Jeff Brown
6801cedb76 am 6a3e7dfa: am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit '6a3e7dfa87345244190403eaad71e760f11305ba' into kraken

* commit '6a3e7dfa87345244190403eaad71e760f11305ba':
  Fix alarms with negative or very large wakup times.
2010-03-31 16:06:53 -07:00
Jeff Brown
6a3e7dfa87 am c738783c: Merge "Fix alarms with negative or very large wakup times." into froyo
Merge commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc' into froyo-plus-aosp

* commit 'c738783cc2b7b5bde1f0c25ed2cb4f9fd4df38cc':
  Fix alarms with negative or very large wakup times.
2010-03-31 16:00:58 -07:00
Jeff Brown
c738783cc2 Merge "Fix alarms with negative or very large wakup times." into froyo 2010-03-31 15:56:30 -07:00
Jeff Brown
11c5f1a65d Fix alarms with negative or very large wakup times.
When the wakeup time is negative, the kernel /dev/alarm driver
never triggers the alarm.  This can cause alarms to back up in the
priority queue since an alarm at the head with a negative wakup time
will never be triggered.  Now we use 0 as the wakup time which causes
an immediate triggering.

When the wakeup time is very large, it is possible for a numeric
overflow to occur when converting the timestamp from milliseconds
since epoch to nanoseconds.  This has been fixed by avoiding the
intermediate conversion in the JNI call so that overflow cannot
occur.

Bug: b/2558820
Change-Id: I4f5b4646a04090cc749a9fc5d3982a68402954ef
2010-03-31 15:38:08 -07:00
Dianne Hackborn
7878238ebd am 8cb52c8a: am bc50bdca: am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app 2010-03-31 11:23:56 -07:00
Dianne Hackborn
8cb52c8a7d am bc50bdca: am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16' into kraken

* commit 'bc50bdca0ae1f7d173e4f589db250dc519740c16':
  Fix issue #2558391: Package manager problem when not replacing existing system partition app
2010-03-31 11:17:01 -07:00
Dianne Hackborn
bc50bdca0a am e259bc77: Fix issue #2558391: Package manager problem when not replacing existing system partition app
Merge commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58' into froyo-plus-aosp

* commit 'e259bc770b3eeb88eb7a03ec0af2522ca9929f58':
  Fix issue #2558391: Package manager problem when not replacing existing system partition app
2010-03-31 11:14:13 -07:00
Dianne Hackborn
e259bc770b Fix issue #2558391: Package manager problem when not replacing existing system partition app
This fixes the package manager to ensure we can't get in this bad state of
an update to a system app being installed as a separate app.

Change-Id: I2a3f601bbc06b74f31ca09192993614bc6885ff7
2010-03-31 11:07:47 -07:00
Eric Olsen
2544a74dff am 8d72c644: am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo 2010-03-31 10:18:15 -07:00
Eric Olsen
8d72c64404 am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9' into kraken

* commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9':
  Add thermal shutdown.  If battery temp >= 68C.
2010-03-31 10:12:26 -07:00
Eric Olsen
f26cf98ffa am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit '711065587b46ea0279788757c49a273ff796f844' into froyo-plus-aosp

* commit '711065587b46ea0279788757c49a273ff796f844':
  Add thermal shutdown.  If battery temp >= 68C.
2010-03-31 10:07:36 -07:00