Commit Graph

102923 Commits

Author SHA1 Message Date
Kenny Root
d62554eaeb am a3598346: Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev
* commit 'a35983469b40ad697af5f1ea1ead41e0e5649f10':
  Add API to query KeyChain algorithm support, pt. 2
2013-04-02 12:09:08 -07:00
Mita Yun
4b808adc44 am ed181586: Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev
* commit 'ed181586a7ef0229edb27ba33d087d199ec81d53':
  Fixed a NPE in AccountManagerService
2013-04-02 12:05:32 -07:00
Kenny Root
a35983469b Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev 2013-04-02 18:40:54 +00:00
Mita Yun
ed181586a7 Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev 2013-04-02 18:33:03 +00:00
Mita Yun
f4c240e68a Fixed a NPE in AccountManagerService
Bug: 8518620
Change-Id: Idf9b5864896ec57c63e3987fc01c73a5c983b5e2
2013-04-02 11:32:27 -07:00
Kenny Root
5b7e90ac93 Add API to query KeyChain algorithm support, pt. 2
Late-breaking comments on API name. Revised.

Bug: 7095660
Change-Id: I7224d9c8a4f84a272360ede78a18bfb72d8aeb77
2013-04-02 11:23:41 -07:00
Kenny Root
5c45d95b83 am 1ea4a5ba: Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev
* commit '1ea4a5ba859c70b7e7414e1f6a2a772cf9dd5cfb':
  Add API to query KeyChain algorithm support
2013-04-02 10:55:23 -07:00
Kenny Root
1ea4a5ba85 Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev 2013-04-02 17:52:26 +00:00
Kenny Root
bf556ac636 Add API to query KeyChain algorithm support
Bug: 7095660
Change-Id: Ia87caaa33bc01b032130811833f0a3c4f75b62d4
2013-04-02 10:34:24 -07:00
Craig Mautner
79b468dcaa Merge "Fix potential deadlock between LockScreen and WindowManagerService" into jb-mr2-dev-plus-aosp 2013-04-02 17:34:00 +00:00
Sangkyu Lee
0438bd692b Fix potential deadlock between LockScreen and WindowManagerService
If LockScreen is enhanced using SurfaceView/GLSurfaceView,
deadlock problem between LockScreen and WindowManagerService
can occur because of IWindow.resized() callback.
And it must lead to watchdog and reset.

IWindow.resized() callback is one-way function so calling resized()
callback of a remote IWindow object is never blocked.
However, calling resized() callback of a local IWindow object
(LockScreen is running on the same system_server process)
is always blocked until resized() callback returns.
Because resized() callback of SurfaceView/GLSurfaceView can lead to
WindowManagerService.relayoutWindow() call, deadlock can occur
between relayoutWindow() and performLayoutAndPlaceSurfacesLockedInner().
(Both functions need locking mWindowMap)

So this patch simulate one-way call when calling resized() callback
of a local IWindow object.

Change-Id: I2a6a5c74ed22d8e6b7a3bea3424ff2879d227105
Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>

Conflicts:
	services/java/com/android/server/wm/WindowManagerService.java
2013-04-02 10:28:13 -07:00
quddusc
967b5897df am c29f6d4a: am d9221826: am a6eaec81: am dd50e98c: am f634d6a2: am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs
* commit 'c29f6d4a99bf2624ae7ba3aad18960ce7e13451d':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
2013-04-02 10:08:35 -07:00
quddusc
c29f6d4a99 am d9221826: am a6eaec81: am dd50e98c: am f634d6a2: am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs
* commit 'd922182604836823b17e6e137a7757465d418848':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
2013-04-02 10:06:25 -07:00
quddusc
d922182604 am a6eaec81: am dd50e98c: am f634d6a2: am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs
* commit 'a6eaec812f1d0d2d551d0d98b67bb22cfc26c31a':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
2013-04-02 10:04:19 -07:00
quddusc
a6eaec812f am dd50e98c: am f634d6a2: am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs
* commit 'dd50e98c8c47672082f7f7a5e82c72eb4226212a':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
2013-04-02 10:02:58 -07:00
quddusc
dd50e98c8c am f634d6a2: am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs
* commit 'f634d6a2d4db8edefb526a5281ca123301514bfc':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
2013-04-02 10:00:50 -07:00
quddusc
f634d6a2d4 am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs
* commit 'c0050433cd31926a9832ab28fde06a9a9753bd21':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
2013-04-02 09:58:28 -07:00
quddusc
c0050433cd Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs 2013-04-02 16:56:05 +00:00
Jean-Michel Trivi
5514aff44d am c3c7b92a: Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev
* commit 'c3c7b92a8128831445d2a185b0986c60d929b150':
  Clean up role of component name in media button event receiver
2013-04-02 08:56:57 -07:00
Jean-Michel Trivi
c3c7b92a81 Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev 2013-04-02 15:54:11 +00:00
The Android Open Source Project
30373c5b5b Reconcile with jb-mr2-release - do not merge
Change-Id: I58918ca2ce096a604a97119d0c0bd232ef064a5a
2013-04-02 08:39:31 -07:00
Chet Haase
7aab113423 am c99d3c1f: Stop jank from window animations overlapping activity animations
* commit 'c99d3c1fd618c1f64103b4f39dd95330309be5a3':
  Stop jank from window animations overlapping activity animations
2013-04-02 08:24:48 -07:00
Jeff Brown
6c48c4317e am 579b0c09: Merge "Fix a doc typo." into jb-mr2-dev
* commit '579b0c091cd64a27b3e7d5bad8668dd9f3f92bb3':
  Fix a doc typo.
2013-04-02 08:24:41 -07:00
Chris Craik
bb3c5e184a am 94d6170b: Merge "Update view\'s alpha and layer docs" into jb-mr2-dev
* commit '94d6170b67bcfb5dc5a0c988752d34e64a5f5272':
  Update view's alpha and layer docs
2013-04-02 08:24:32 -07:00
Eric Laurent
756561f1fc am 742647c8: Merge "AudioService: removed last audible volume index" into jb-mr2-dev
* commit '742647c809622703207c34171d482c562e34b10b':
  AudioService: removed last audible volume index
2013-04-02 08:24:26 -07:00
Jeff Brown
21b41af7ea am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev
* commit 'd42ae93c44a28f63d8f266277644864bfd0f4a16':
  Make MessageQueue and Looper final.
2013-04-02 08:24:15 -07:00
Winson Chung
0853ec1598 am 3a5a7749: Fixing NPE on screenshot error. (Bug 8328886)
* commit '3a5a774954d28911bbf9eaa7dfd8329a085fbdc5':
  Fixing NPE on screenshot error. (Bug 8328886)
2013-04-02 08:24:03 -07:00
Christopher Tate
c16da6aa15 am 73882cf4: Merge "debuggerd now notifies the Activity Manager about native crashes" into jb-mr2-dev
* commit '73882cf489b44cfd393701c0629bb2d3613857d1':
  debuggerd now notifies the Activity Manager about native crashes
2013-04-02 08:23:41 -07:00
Michael Wright
ef588f73cf am 54531f81: Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev
* commit '54531f819567066fe4a5219eb445a453551be374':
  Flush pending input events immediately upon channel dispose
2013-04-02 08:23:38 -07:00
Michael Wright
6192341835 am cd928a41: Merge "Start input event sequence numbers at 1" into jb-mr2-dev
* commit 'cd928a41a5657bc79f2488f241463dbb75f7ad42':
  Start input event sequence numbers at 1
2013-04-02 08:23:36 -07:00
Chet Haase
c99d3c1fd6 Stop jank from window animations overlapping activity animations
Relaunching a running activity will sometimes cause animations in that
activity to run, causing jank due to too much happening (window animations
on that same window running at the same time).

An earlier fix pauses application rendering while window animations are running,
but only the first time the activity comes up. If the window is animated
after that (such as is the case with re-launching it while it is running
in the background), rendering, and therefore animations, happen as usual,
causing the jank.

The fix is to simply broaden the scope of when application rendering is
paused to include anytime the window is animating.

Issue #8472972 Make app animations play nice with window animations

Change-Id: I1dd8da039fcb4d1faf6c0811bae97ef2847deb84
2013-04-02 07:30:52 -07:00
Jeff Brown
579b0c091c Merge "Fix a doc typo." into jb-mr2-dev 2013-04-02 03:24:10 +00:00
Jeff Brown
24e22d19a2 Fix a doc typo.
Change-Id: Id41af7644e552b0fbfe90818d0a9f42178c6474d
2013-04-01 19:41:41 -07:00
quddusc
ce4027bd2d docs: Added details about key/signature for IAB/Licensing docs.
Bugs: 8338447

Change-Id: Ifc5556dc096065e59d34f6cde8fde2b64e5b200e
2013-04-01 18:43:50 -07:00
Chris Craik
94d6170b67 Merge "Update view's alpha and layer docs" into jb-mr2-dev 2013-04-02 01:04:30 +00:00
Eric Laurent
742647c809 Merge "AudioService: removed last audible volume index" into jb-mr2-dev 2013-04-02 00:32:32 +00:00
Chris Craik
16ecda5317 Update view's alpha and layer docs
bug:8501661

Makes the performance issues and interaction with layer type/paint
more clear.

Additionally, corrects change from 47ab7d6612
to still allow displayList alpha to override layer paint

Change-Id: Ic94d75865700820489370461cd8ac9f9077a8d90
2013-04-01 17:21:35 -07:00
Jeff Brown
d42ae93c44 Merge "Make MessageQueue and Looper final." into jb-mr2-dev 2013-04-01 23:39:11 +00:00
Eric Laurent
42b041ed4f AudioService: removed last audible volume index
Removed storage of last audible stream volume index.
This information is redundant because we already have
two pieces of information (current volume and mute state)
allowing to completely define which volume should actually
be applied by the framework or indicated to apps.

The last audible index management had anyway been broken by
successive changes making that the value stored could be 0
in some cases causing problems like issue 8109149 when
restoring the volume settings from the DB.

Bug 8109149

Change-Id: Iea80f5a994554e42d45b227f651ec9646844aa77
2013-04-01 16:16:57 -07:00
Winson Chung
3a5a774954 Fixing NPE on screenshot error. (Bug 8328886)
Change-Id: Id47b8429c512c02e63d86de2ce37bd8e3ee02359
2013-04-01 16:04:28 -07:00
Jeff Brown
67fc67cf3e Make MessageQueue and Looper final.
Applications already cannot subclass these classes because
their constructors are not visible.

Change-Id: Id979d86dd05f7bcc888fe4ea499ab9b95d3d5dde
2013-04-01 14:27:57 -07:00
Christopher Tate
73882cf489 Merge "debuggerd now notifies the Activity Manager about native crashes" into jb-mr2-dev 2013-04-01 21:22:27 +00:00
Michael Wright
54531f8195 Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev 2013-04-01 21:20:16 +00:00
Michael Wright
cd928a41a5 Merge "Start input event sequence numbers at 1" into jb-mr2-dev 2013-04-01 21:19:11 +00:00
Christopher Tate
58d380d2af debuggerd now notifies the Activity Manager about native crashes
The Activity Manager sets up a permission-guarded domain socket, which
debuggerd connects to when a crash happens.  If this is successful,
the daemon then mirrors the logged crash report to that socket, then
closes it.

The Activity Manager parses the native crash dump supplied by debuggerd
and forwards it to the standard app-crashed code.  The UX result is
that users now see the normal "app has stopped unexpectedly" dialog
with "report" and "okay" options for native crashes, not just for
DVM-mediated crashes.

Bug 8322568

Change-Id: Ie1b279896c603bd74d82d6cfcfd66a8f231da134
2013-04-01 13:50:23 -07:00
Tim Murray
28c2246f0b am 4134ce33: Merge "Fix blur intrinsic creation." into jb-mr2-dev
* commit '4134ce3386e791bd2e024677197e36a3b4768dbb':
  Fix blur intrinsic creation.
2013-04-01 13:29:57 -07:00
Tim Murray
4134ce3386 Merge "Fix blur intrinsic creation." into jb-mr2-dev 2013-04-01 20:27:28 +00:00
Michael Wright
ef17e8710e Flush pending input events immediately upon channel dispose
Change-Id: I949326423f733376aa8d3121bfed24fd76ca0784
2013-04-01 13:15:55 -07:00
Michael Wright
10f9b0997e Start input event sequence numbers at 1
Change-Id: Ia69574cb25bfced8bbeefbc23350706bacdfee12
2013-04-01 13:11:34 -07:00
Tim Murray
bddc7ffb52 Fix blur intrinsic creation.
Change-Id: Iaf54c7395d447eec94d8b6c12986fa8d16c030f5
2013-04-01 12:47:38 -07:00