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

103169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
6c918cec31 Add direct API to get ManifestDigest 
This makes it faster for applications that don't want to collect all the
certificates but do want the AndroidManifest.xml digest.

Bug: 8528639
Change-Id: Ide9498d0981188960af194a9568387337c075bcc
 2013-04-02 14:22:03 -07:00
Michael Wright
bfdec89085 am 75e181dd: Merge "Lock when obtaining the current monitor name." into jb-mr2-dev 
* commit '75e181ddfec2166026a0ce553eca2a339e21b968':
  Lock when obtaining the current monitor name.
 2013-04-02 14:06:03 -07:00
Scott Main
73be8e6c41 am 03073519: am 7d230196: am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data. 
* commit '03073519ce9b4009aabba2a03f5feab42bab7c80':
  update dashboards for 4/1. Now charts are generated from JSON data.
 2013-04-02 14:02:33 -07:00
Michael Wright
75e181ddfe Merge "Lock when obtaining the current monitor name." into jb-mr2-dev 2013-04-02 21:01:27 +00:00
Scott Main
03073519ce am 7d230196: am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data. 
* commit '7d2301965621ccd10b0ab7afba37fffcc566b05a':
  update dashboards for 4/1. Now charts are generated from JSON data.
 2013-04-02 13:59:18 -07:00
Scott Main
7d23019656 am 065cdf93: am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data. 
* commit '065cdf93a08eb65239f37b3837ca95f31fddad8b':
  update dashboards for 4/1. Now charts are generated from JSON data.
 2013-04-02 13:55:12 -07:00
Scott Main
065cdf93a0 am be71cf4e: am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data. 
* commit 'be71cf4e21a2cbb95cf6475b89d064d8a571181b':
  update dashboards for 4/1. Now charts are generated from JSON data.
 2013-04-02 13:53:01 -07:00
Scott Main
be71cf4e21 am 5fd986bc: am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data. 
* commit '5fd986bcb38dabfa8e79d026d4d3f287ae975f3b':
  update dashboards for 4/1. Now charts are generated from JSON data.
 2013-04-02 13:51:00 -07:00
Scott Main
5fd986bcb3 am 3cd0b46c: update dashboards for 4/1. Now charts are generated from JSON data. 
* commit '3cd0b46ca4a4ab5ec597fe42f8637d0df5d83e5a':
  update dashboards for 4/1. Now charts are generated from JSON data.
 2013-04-02 13:47:54 -07:00
Scott Main
3cd0b46ca4 update dashboards for 4/1. 
Now charts are generated from JSON data.

Change-Id: I17180b993a9ba50daf8a269ad26093079fd1da65
 2013-04-02 13:29:54 -07:00
Brian Colonna
5856ee4bd6 am 1eccc0cf: Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev 
* commit '1eccc0cf5f7f33203091c0b475a4ad91570c85cd':
  FUL now restarts when flipping tablet 180 (bug 7484464)
 2013-04-02 13:26:23 -07:00
Brian Colonna
1eccc0cf5f Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev 2013-04-02 20:19:24 +00:00
Nick Kralevich
d2cc888cb9 am 55cfcd75: Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev 
* commit '55cfcd75691581ffc4f88034711a2442db619a53':
  doSignaturePermission -> grantSignaturePermission
 2013-04-02 12:48:26 -07:00
Nick Kralevich
c77d3b16d7 am f667c8d3: Merge "grantPermissionsLPw: introduce isNewPlatformPermissionForPackage" into jb-mr2-dev 
* commit 'f667c8d327a6ae236468cbcf9f7536cf6d17e578':
  grantPermissionsLPw: introduce isNewPlatformPermissionForPackage
 2013-04-02 12:48:23 -07:00
Nick Kralevich
0f67b2550c am 5b7d1481: Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev 
* commit '5b7d1481936b1c41da01cbf763c09266dd13e6f1':
  grantPermissionsLPw: get rid of a level of curly braces
 2013-04-02 12:44:44 -07:00
Nick Kralevich
b590b80e36 am bb7ba4ae: Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev 
* commit 'bb7ba4ae67e486166547865b56efbd99e51f039a':
  grantPermissionsLPw: introduce doSignaturePermission
 2013-04-02 12:44:40 -07:00
Nick Kralevich
55cfcd7569 Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev 2013-04-02 19:44:02 +00:00
Nick Kralevich
f667c8d327 Merge "grantPermissionsLPw: introduce isNewPlatformPermissionForPackage" into jb-mr2-dev 2013-04-02 19:43:09 +00:00
Nick Kralevich
5b7d148193 Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev 2013-04-02 19:41:46 +00:00
Nick Kralevich
bb7ba4ae67 Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev 2013-04-02 19:40:23 +00:00
Robert Greenwalt
a51a638184 am 279e22bd: Merge "make new API to retrieve group identifier level1" into jb-mr2-dev 
* commit '279e22bd35a97cc2676872fbc841b5f3bb060abf':
  make new API to retrieve group identifier level1
 2013-04-02 12:21:51 -07:00
Elliott Hughes
1113956349 am dbca824d: Merge "Add DateFormat.getBestDateTimePattern." into jb-mr2-dev 
* commit 'dbca824dc00209c603a956f45bb684e57ee3e478':
  Add DateFormat.getBestDateTimePattern.
 2013-04-02 12:21:48 -07:00
Robert Greenwalt
279e22bd35 Merge "make new API to retrieve group identifier level1" into jb-mr2-dev 2013-04-02 19:17:23 +00:00
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
95e3ee3971 Remove keystore entries when package removed 
Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.

Bug: 3020069
Change-Id: Id4b1d51a5fa4c418865055635a84bebcf5b65ec8
 2013-04-02 11:50:16 -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