drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,749 Commits 1 Branch 0 Tags
Commit Graph

103749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
31f8b2d2f9 am d62554ea: am a3598346: Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev 
* commit 'd62554eaebd391cd6e69c262fbb0be7bcf0a679b':
  Add API to query KeyChain algorithm support, pt. 2
 2013-04-02 12:11:51 -07: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
af210f6d27 am 4b808adc: am ed181586: Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev 
* commit '4b808adc44b8d5f1538eff40e5b685c14154b948':
  Fixed a NPE in AccountManagerService
 2013-04-02 12:08:10 -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
20309b0df8 am 5c45d95b: am 1ea4a5ba: Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev 
* commit '5c45d95b837fc6adb7eb16816f3e2581fc527803':
  Add API to query KeyChain algorithm support
 2013-04-02 11:04:41 -07:00
Craig Mautner
08426453f3 am 79b468dc: Merge "Fix potential deadlock between LockScreen and WindowManagerService" into jb-mr2-dev-plus-aosp 
* commit '79b468dcaab89f52394132d5ee733c6a01bad7e9':
  Fix potential deadlock between LockScreen and WindowManagerService
 2013-04-02 11:04:37 -07:00
quddusc
6e5980f164 am 967b5897: 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 '967b5897df7c4ee108003ef97ebdda91900f4851':
  docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447
 2013-04-02 11:04:32 -07:00
Jean-Michel Trivi
5d26e13281 am 5514aff4: am c3c7b92a: Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev 
* commit '5514aff44d506ce23cd14d73962de335224db707':
  Clean up role of component name in media button event receiver
 2013-04-02 11:04:21 -07:00
The Android Open Source Project
5a34f2e407 am 30373c5b: Reconcile with jb-mr2-release - do not merge 
* commit '30373c5b5b44953ebc03e0a0523efd1b42557ebf':
  Finish any event in the current input queue
  Prevent crash when a single layer is enqueued several times for updates Bug #8504687
 2013-04-02 11:04:12 -07:00
Chet Haase
d4c5453464 am 7aab1134: am c99d3c1f: Stop jank from window animations overlapping activity animations 
* commit '7aab1134236a30aa2e595be55fcc7b5c90982413':
  Stop jank from window animations overlapping activity animations
 2013-04-02 11:03:16 -07:00
Jeff Brown
c4b5572259 am 6c48c431: am 579b0c09: Merge "Fix a doc typo." into jb-mr2-dev 
* commit '6c48c4317e29002281ef18bd706b530986a26964':
  Fix a doc typo.
 2013-04-02 11:03:12 -07:00
Chris Craik
92ce5e95b8 am bb3c5e18: am 94d6170b: Merge "Update view\'s alpha and layer docs" into jb-mr2-dev 
* commit 'bb3c5e184a41ec3ad7d11c3a0a66439edda4f74d':
  Update view's alpha and layer docs
 2013-04-02 11:03:09 -07:00
Eric Laurent
edd719a9b5 am 756561f1: am 742647c8: Merge "AudioService: removed last audible volume index" into jb-mr2-dev 
* commit '756561f1fc980ac7212141c5a5e27182a94a36d1':
  AudioService: removed last audible volume index
 2013-04-02 11:03:07 -07:00
Jeff Brown
76703d8fe5 am 21b41af7: am d42ae93c: Merge "Make MessageQueue and Looper final." into jb-mr2-dev 
* commit '21b41af7ea418be8e0ec94800bb2d0cc12c4965e':
  Make MessageQueue and Looper final.
 2013-04-02 11:03:04 -07:00
Winson Chung
f11638b950 am 0853ec15: am 3a5a7749: Fixing NPE on screenshot error. (Bug 8328886) 
* commit '0853ec1598e454647a79353aaa98a12c7b8bd09a':
  Fixing NPE on screenshot error. (Bug 8328886)
 2013-04-02 11:03:00 -07:00
Kenny Root
232b4d60a6 resolved conflicts for merge of c16da6aa to master 
Change-Id: Ibaaf2995def15573609562162902b3d73dd78ec0
 2013-04-02 10:57:10 -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
Craig Mautner
4a5a7bd969 Merge "Yet more movement from ActivityStack to Supervisor" 2013-04-02 16:50:03 +00:00
Craig Mautner
df294cf44d Merge "More movement from ActivityStack to Supervisor" 2013-04-02 16:47:23 +00:00
Craig Mautner
aa8ca99d4a Merge "Move performClearTaskLocked into TaskRecord." 2013-04-02 16:46:18 +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
Michael Wright
bc15cf55f5 am ef588f73: am 54531f81: Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev 
* commit 'ef588f73cf9bf01a693f468f597239e27834c730':
  Flush pending input events immediately upon channel dispose
 2013-04-02 08:26:04 -07:00
Michael Wright
05087c6dda am 61923418: am cd928a41: Merge "Start input event sequence numbers at 1" into jb-mr2-dev 
* commit '61923418351d07fac940ca16b8833266f778dd63':
  Start input event sequence numbers at 1
 2013-04-02 08:26:01 -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