102988 Commits

Author SHA1 Message Date
Elliott Hughes
dbca824dc0 Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev 2013-04-02 19:16:17 +00:00
Dianne Hackborn
69fe406929 am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev
* commit '006c633896e6738297e7bc96128c56b03fbf8d01':
  Fix bug in initializing preferred activities.
2013-04-02 12:09:13 -07:00
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
Dianne Hackborn
006c633896 Merge "Fix bug in initializing preferred activities." into jb-mr2-dev 2013-04-02 19:01:18 +00:00
Elliott Hughes
031b581af2 Add DateFormat.getBestDateTimePattern.
Bug: 8283323
Change-Id: Id8d94456b93555d799229b7dd88fcbcf5c6bf7ff
2013-04-02 12:00:47 -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
Nick Kralevich
94b8c93789 doSignaturePermission -> grantSignaturePermission
Change-Id: Iee3c24c8ce5ebbd0b0e8cf7b0e308f998fc6eaf9
2013-04-02 09:38:00 -07:00
Nick Kralevich
3337dbf707 grantPermissionsLPw: introduce isNewPlatformPermissionForPackage
Make grantPermissionsLPw by refactoring some code into a new
function, isNewPlatformPermissionForPackage.

No functional changes.

Change-Id: I467dacfe1fcf7e77cef4cb6df54536eeaafd9064
2013-04-02 09:38:00 -07:00
Nick Kralevich
daae541ac3 grantPermissionsLPw: get rid of a level of curly braces
We can get rid of an indention level by modifying an if/else
block slightly.

No functional changes.

Change-Id: I0404093ea9ebe7729417d825afb6e97e158ad23e
2013-04-02 09:38:00 -07:00
Nick Kralevich
35bee33d6f grantPermissionsLPw: introduce doSignaturePermission
Make grantPermissionsLPw smaller by introducing a new doSignaturePermission
function.

Just a refactoring. No functional code changes.

Change-Id: Ia967fd93e3f7cf3e48fcd13be0b04994b76d36f3
2013-04-02 09:38:00 -07: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 Tinker
16b8cffb28 MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
2013-04-01 21:59:35 -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
Dianne Hackborn
4d491a605e Fix bug in initializing preferred activities.
Now that we are smarter about the initialization, we need
to do this after all packages are scanned.

Change-Id: I598f5ef84dcc83779bbff29e4c92136c63fb32de
2013-04-01 18:10:51 -07:00
Lorenzo Colitti
213f98b6fe Fix LinkProperties's equals() method.
LinkProperties's equals() method was broken by the addition of
stacked interfaces. The reason was that equals() was checking
the equality of mStackedInterfaces.keys(), which is just an
enumeration, instead of mStackedInterfaces.keySet(), which
actually contains the keys. The test was failing, but I didn't
notice.

Fix the bug and make the test check the objects more in depth
so it can give more detailed error messages when equals() fails.

Bug: 8276725
Change-Id: Ie990bd75f641c28e63e54d953dcd0f4de13f7c9f
2013-04-02 10:08:59 +09: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 47ab7d6612e2b5b8b66fb261dafef7c91264e173
to still allow displayList alpha to override layer paint

Change-Id: Ic94d75865700820489370461cd8ac9f9077a8d90
2013-04-01 17:21:35 -07:00
Michael Wright
8fa56f60a7 Lock when obtaining the current monitor name.
Also, remove some dead code.

Change-Id: I0e65671f9ca43addd8fc44dcd878bcff2f588e42
2013-04-01 16:46:36 -07:00
Jeff Brown
d42ae93c44 Merge "Make MessageQueue and Looper final." into jb-mr2-dev 2013-04-01 23:39:11 +00:00