9545 Commits

Author SHA1 Message Date
Amith Yamasani
a5695eeeaf am 0aeb05e6: Merge "Fix a problem in finish affinity in Activity Manager." into jb-dev
* commit '0aeb05e6ded37dcf3d02ee1e8021ed61d4fec52a':
  Fix a problem in finish affinity in Activity Manager.
2012-05-15 12:06:27 -07:00
Dianne Hackborn
f2d3c418c4 am 1bcd6b8c: am a827843f: Merge "Fix issue #6020164: Settings crashed on orientation change..." into jb-dev
* commit '1bcd6b8ce8f7769e0b61dd630c98d56116d43595':
  Fix issue #6020164: Settings crashed on orientation change...
2012-05-15 11:38:54 -07:00
Geremy Condra
2cbb95e12b am c9e7aede: am b696c054: Merge "Adds support for the CertBlacklister." into jb-dev
* commit 'c9e7aede3e8c9b4b515e5be8b80b91043ee984e7':
  Adds support for the CertBlacklister.
2012-05-15 11:38:27 -07:00
Kenny Root
c4ad4e33b4 am 017c5f78: am 4ebaf0f1: Merge "Change thread priority for disk measurement to bg" into jb-dev
* commit '017c5f78d9e56d07e77d707565f376a7ac6b56a4':
  Change thread priority for disk measurement to bg
2012-05-15 11:38:24 -07:00
Dianne Hackborn
1bcd6b8ce8 am a827843f: Merge "Fix issue #6020164: Settings crashed on orientation change..." into jb-dev
* commit 'a827843f9b46700a187bd3a506498a0f36f474fa':
  Fix issue #6020164: Settings crashed on orientation change...
2012-05-15 11:31:16 -07:00
Geremy Condra
c9e7aede3e am b696c054: Merge "Adds support for the CertBlacklister." into jb-dev
* commit 'b696c0542cae70d7f66b9011be2f9d1812885159':
  Adds support for the CertBlacklister.
2012-05-15 11:30:36 -07:00
Kenny Root
017c5f78d9 am 4ebaf0f1: Merge "Change thread priority for disk measurement to bg" into jb-dev
* commit '4ebaf0f1d4be34f475bb663784b40cf79b9d2184':
  Change thread priority for disk measurement to bg
2012-05-15 11:30:23 -07:00
Amith Yamasani
bfc1be1101 Fix a problem in finish affinity in Activity Manager.
Finishing tasks with an activity affinity was failing if the
activity was found at index 0. This fixes the loop condition.

Change-Id: If2e0d294e3e4493bca8b7efd40f24adaf2eb0b6f
2012-05-15 11:12:17 -07:00
Jamie Gennis
e4a5b4a5bc am 06220076: am 04d35218: Merge "WindowManager: unset the wallpaper window crop" into jb-dev
* commit '06220076ab63e1f0e72938febfdf26bdd030696d':
  WindowManager: unset the wallpaper window crop
2012-05-14 19:37:44 -07:00
Svetoslav Ganov
93a0d2f2a1 am 1ec37a9b: am 11fd02f6: Merge "Update the API version checks." into jb-dev
* commit '1ec37a9b173d0357c22cb489a55c532e4f9a7c0c':
  Update the API version checks.
2012-05-14 19:37:30 -07:00
Svetoslav Ganov
06b0e27b90 am 21ba7c96: am 8f761760: Merge "Removing default accessibility gesture handling." into jb-dev
* commit '21ba7c9603c60911efacf62eb74dd666ea75e6e8':
  Removing default accessibility gesture handling.
2012-05-14 19:37:27 -07:00
Dianne Hackborn
6917b2a10d am 2da87ec3: am 2a7a6ca0: Merge "Implement new window cropping." into jb-dev
* commit '2da87ec32e72c2c25998e2444155c00074cfbd40':
  Implement new window cropping.
2012-05-14 19:37:21 -07:00
Jamie Gennis
06220076ab am 04d35218: Merge "WindowManager: unset the wallpaper window crop" into jb-dev
* commit '04d3521839c90d1cccf3ee428963a0aef0088ef9':
  WindowManager: unset the wallpaper window crop
2012-05-14 19:33:35 -07:00
Svetoslav Ganov
1ec37a9b17 am 11fd02f6: Merge "Update the API version checks." into jb-dev
* commit '11fd02f63acba18a1b03351b595490597136fc6a':
  Update the API version checks.
2012-05-14 19:32:49 -07:00
Svetoslav Ganov
21ba7c9603 am 8f761760: Merge "Removing default accessibility gesture handling." into jb-dev
* commit '8f76176016a63026168f5886604d4378f170fc6c':
  Removing default accessibility gesture handling.
2012-05-14 19:32:47 -07:00
Dianne Hackborn
2da87ec32e am 2a7a6ca0: Merge "Implement new window cropping." into jb-dev
* commit '2a7a6ca00ab176105b5bbfa6b17bb0dcd058d517':
  Implement new window cropping.
2012-05-14 19:32:39 -07:00
Dianne Hackborn
a827843f9b Merge "Fix issue #6020164: Settings crashed on orientation change..." into jb-dev 2012-05-14 17:31:53 -07:00
Dianne Hackborn
b61a02657b Fix issue #6020164: Settings crashed on orientation change...
...while listening to TTS example

This was a nice one.  What was happening is that immediately upon
being created, the activity was starting another activity in a
different process.  The second activity would never show, just
immediately exit.  However the original activity had time to
pause and get into stopping itself before the second activity had
come back to the activity manager to say it was going away, resulting
in the activity manager asking the original activity to resume.

At this point the activity manager's state is that the second
activity is finishing and gone, and the original activity is
resumed.  However in the app process the original activity is
still working on stopping itself, and it eventually completes
this and tells the activity manager.  The activity manager now
changes its state to STOPPED, even though it is actually resumed
and that is the last thing it told it to be, and it is now
proceeding to set itself in that state.

This would result later in the activity manager sending an
unnecessary state change to the application.  In the case of
the screen here, we next do a rotation change, the activity
manager thinks the current state is STOPPED not RESUMED, so it
tells the application to relaunch the activity in a new config
but not in the resumed state.  Now it does the whole "start a
new temporary activity" thing again, at which point it tries
to pause the original activity again, and we have an unbalanced
onPause() call to the app and it falls over.

Change-Id: I38b680746f4c61ae30e7ce831e1de187adf60902
2012-05-14 17:19:18 -07:00
Geremy Condra
b696c0542c Merge "Adds support for the CertBlacklister." into jb-dev 2012-05-14 15:53:48 -07:00
Kenny Root
a69b7eb1fc Change thread priority for disk measurement to bg
Change the thread priority for all disk measurement and statfs calls to
background priority.

Also move the measurement fully into the measurement task since it makes
more sense.

Bug: 6332097
Change-Id: Iafc2151313ad9b14117daf67e933dccd32f68d54
2012-05-14 15:02:19 -07:00
Michael Jurka
577ad3f14d am e4046724: am c8179e78: Merge "Improve transition out of recents" into jb-dev
* commit 'e4046724f6de620d0660dec32c70808fb94abc99':
  Improve transition out of recents
2012-05-14 08:37:59 -07:00
Jeff Brown
1243d62c29 am a1f13767: am 11cfd0d4: Merge "Tell power HAL when user activity occurs." into jb-dev
* commit 'a1f13767b37fe723895f1f09a907b739885483d7':
  Tell power HAL when user activity occurs.
2012-05-14 08:37:30 -07:00
Jeff Brown
ac592fb3b6 am a4881637: am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev
* commit 'a48816375f68a8b4a945efcb68e405308a50adc9':
  Move power HAL interactions to PowerManagerService.
2012-05-14 08:37:26 -07:00
Craig Mautner
cf462d65d2 am ba523324: am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev
* commit 'ba523324f32ca55221e07e31b2d0699826daa2fe':
  Keep launcher screen from flashing over lockscreen
2012-05-14 08:36:05 -07:00
Jeff Sharkey
d640d0641a am f2fe4cb1: am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
* commit 'f2fe4cb11b2b93acf1a983e856efe26b6bb79683':
  Enforce READ_EXTERNAL through Settings.Secure.
2012-05-14 08:35:42 -07:00
Jeff Brown
d4bef4b786 am 47272c93: am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
* commit '47272c932ab6157022aaefd015e5d1df9dc5bd2f':
  Minor refactoring before starting on velocity tracker changes.
2012-05-14 07:48:31 -07:00
Jeff Brown
179817387b am f4df93ce: am 2f095760: Rename kcm attribute to keyboardLayout.
* commit 'f4df93cec62861e3f185979612360c27dd80e043':
  Rename kcm attribute to keyboardLayout.
2012-05-14 07:47:52 -07:00
Jamie Gennis
521e0d794d WindowManager: unset the wallpaper window crop
This change removes the window crop of the wallpaper when setting its position.

Change-Id: I0f4dc10ea9a724b210f75286580ef391145286df
2012-05-14 04:11:02 -07:00
Svetoslav Ganov
11fd02f63a Merge "Update the API version checks." into jb-dev 2012-05-13 19:09:47 -07:00
Svetoslav Ganov
8f76176016 Merge "Removing default accessibility gesture handling." into jb-dev 2012-05-13 19:09:35 -07:00
Dianne Hackborn
2a7a6ca00a Merge "Implement new window cropping." into jb-dev 2012-05-13 15:24:32 -07:00
Svetoslav Ganov
5a48f9758b Update the API version checks.
1. Since the API version has been finalized this change
   updates the SDk version checks to use the JellyBean
   verson number.

bug:5947249

Change-Id: Ie22fa7e18a7ea7b0c7077d80246a26c17f327ceb
2012-05-13 13:34:00 -07:00
Dianne Hackborn
85afd1b6f8 Implement new window cropping.
The window manager now performs the crop internally, evaluating
it every animation from, to be able to update it along with
the surface position.

Change-Id: I960a2161b9defb6fba4840fa35aee4e411c39b32
2012-05-13 13:31:06 -07:00
Svetoslav Ganov
7b1e0c7046 Removing default accessibility gesture handling.
1. The initial design was to have some accessibility gestures
   being handled by the system if the gesture handling access
   service does not consume the gesture. However, we are not
   sure what a good default is and once we add a default handler
   we cannot remove it since people may rely on it. Thus, we
   take the simples approach and let the accessibility service
   handle the gestures. If no gestures are handled the system
   will work in explore by touch as before.

bug:5932640

Change-Id: I865a83549fa03b0141d27ce9713e9b7bb45a57b4
2012-05-13 12:39:51 -07:00
Michael Jurka
e4046724f6 am c8179e78: Merge "Improve transition out of recents" into jb-dev
* commit 'c8179e78052af3d68725e1160214a736f143f8a2':
  Improve transition out of recents
2012-05-12 14:03:56 -07:00
Michael Jurka
c8179e7805 Merge "Improve transition out of recents" into jb-dev 2012-05-12 14:01:43 -07:00
Michael Jurka
d5895a7e8a Improve transition out of recents
- During the transition, fade the bg to black
- Exiting activity fades to black
- Recents background no longer fades away, because
then it would fight against the fade to black
happening behind it
2012-05-12 13:24:58 -07:00
Geremy Condra
3d33c268cc Adds support for the CertBlacklister.
The CertBlacklister is a mechanism for allowing is to use gservices
to blacklist certs by serial number or public key.

Change-Id: Ie4b0c966a8a43c9823fb550c0b1691204f133ae7
2012-05-12 13:09:45 -07:00
Jeff Brown
a1f13767b3 am 11cfd0d4: Merge "Tell power HAL when user activity occurs." into jb-dev
* commit '11cfd0d41f3c848ffd54ba650aa921d5224e7917':
  Tell power HAL when user activity occurs.
2012-05-11 19:35:26 -07:00
Jeff Brown
a48816375f am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev
* commit '58770232216cd735afdfd3dd53151070e06de5ce':
  Move power HAL interactions to PowerManagerService.
2012-05-11 19:35:23 -07:00
Jeff Brown
11cfd0d41f Merge "Tell power HAL when user activity occurs." into jb-dev 2012-05-11 19:33:17 -07:00
Jeff Brown
5877023221 Merge "Move power HAL interactions to PowerManagerService." into jb-dev 2012-05-11 19:32:56 -07:00
Jeff Brown
30e5eb4826 Tell power HAL when user activity occurs.
Bug: 6435382
Change-Id: I78754158b057851fcba807ebbda143899da387ec
2012-05-11 19:18:56 -07:00
Jeff Brown
7304c34382 Move power HAL interactions to PowerManagerService.
This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server.  Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
2012-05-11 18:42:42 -07:00
Craig Mautner
ba523324f3 am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev
* commit 'ab1c5456b789205ef305b19e5a7682b6561aacac':
  Keep launcher screen from flashing over lockscreen
2012-05-11 16:09:31 -07:00
Craig Mautner
ab1c5456b7 Merge "Keep launcher screen from flashing over lockscreen" into jb-dev 2012-05-11 16:07:10 -07:00
Jeff Sharkey
f2fe4cb11b am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
* commit 'cd5862586ab555b53ffd0a62488843838d1aa94d':
  Enforce READ_EXTERNAL through Settings.Secure.
2012-05-11 15:49:00 -07:00
Jeff Sharkey
cd5862586a Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev 2012-05-11 15:47:01 -07:00
Jeff Sharkey
f53857716a Enforce READ_EXTERNAL through Settings.Secure.
Always defers to user-defined setting, when present.

Bug: 6389556
Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
2012-05-11 15:31:39 -07:00
Jeff Brown
47272c932a am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
* commit 'b12b6b5116e3d76474296b45f570693bb10d6c99':
  Minor refactoring before starting on velocity tracker changes.
2012-05-11 14:06:30 -07:00