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

176428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
baf2838fd2 Symmetric key import for AndroidKeyStore. 
AES and HmacSHA256 symmetric keys can now be imported into
AndroidKeyStore. These keys cannot yet be used.

Bug: 18088752
Change-Id: Iad2fd49d15ac4c2d676abe1153f5b5f0b6ff496c
 2015-03-26 15:37:15 -07:00
Jason Sams
b04f9944fb am 22580b83: Merge "Fix potential npe" 
* commit '22580b83f18b572707ea47f99cb9016f067b89f8':
  Fix potential npe
 2015-03-26 22:35:04 +00:00
Robert Greenwalt
0a5abe5834 am 727cac07: Merge "Add getLegacyVpnInfoPrivileged method" 
* commit '727cac07cc823f4a21be420aa33da6369b390c54':
  Add getLegacyVpnInfoPrivileged method
 2015-03-26 22:34:56 +00:00
Jason Sams
73ffe0cc23 Merge "Catch errors for unknown object types." 2015-03-26 22:30:43 +00:00
Jason Sams
bca8e6d35f Catch errors for unknown object types. 
bug 19805334

Change-Id: I71e172b8123076896737d352403f8ddefca544b6
 2015-03-26 15:29:56 -07:00
Jason Sams
22580b83f1 Merge "Fix potential npe" 2015-03-26 22:10:47 +00:00
Robert Greenwalt
727cac07cc Merge "Add getLegacyVpnInfoPrivileged method" 2015-03-26 22:01:33 +00:00
Jason Sams
ae5be38ebb Fix potential npe 
bug 19805515

Change-Id: Id36b145d3ce1c81311e88f5cdd2441880e98f737
 2015-03-26 14:47:17 -07:00
Deepanshu Gupta
ec8df9af2f Fix tests for Java 6. 
- Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
 2015-03-26 12:29:36 -07:00
Neil Fuller
5a680f2e27 An updater for all timezone data on a device 
The existing one, being deleted here, did not work properly: it only
updated the file used by libcore and bionic, it did not update the ICU
data.

Most of the installation logic exists in code in libcore/tzdata that is
independent of the server code so that it can be tested.

Bug: 19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
 2015-03-26 15:16:32 +00:00
Junichi Monma
ce8a9f53b2 Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test. 
bug id : b/19938983

Change-Id: I7568bb9c41b90a57f2e3b89d3fa694ef692f05ac
 2015-03-26 22:54:21 +09:00
tiger_huang
293e3586cf Clear the previous states before setting the new app visibility 
If setAppVisibility() is called multiple times in a short interval
while the screen is turned off between the calls, the visibility of
the app would be wrong. For example, the user may see the app under
the launcher, not the wallpaper under the launcher.

The flow to the issue:
1. Screen is on.
2. AM calls setAppVisibility() token=App A's token, visible=true
3. Screen is turned off.
4. AM calls setAppVisibility() token=App A's token, visible=false

Note:
a. In 2., WM would put App A into mOpeningApps, and tell it to be
   visible.
b. In 4., because the screen is off now, App A would not be removed
   from mOpeningApps. App A might be told to be invisible directly
   through setTokenVisibilityLocked(), but it would be told to be
   visible again in handleAppTransitionReadyLocked() later.

Change-Id: Icf3d69031ea2822245008248ec8f12bd57218880
 2015-03-26 21:10:24 +08:00
louis_chang
40e259c340 [ActivityManager] Fix ServiceRecord leakage 
Symptom:
The first step of cleaning up application services is
to clear the app state from services (which set sr.app
to null). Then it clean up the service connections.
In some scenario, the Service might be removed during
the connection cleanup (i.e. the Service is no longer
needed). In that case, the Service will be removed from
ServiceMap, but won't be removed from r.app.services in
bringDownServiceLocked(line 1670) because the r.app is null.

Solution:
Remove the service connection first.

Change-Id: I644d73af58fe0e7c1c4a6c9779fe6b5d747b880d
 2015-03-26 13:31:14 +08:00
Michael Runge
9a91bf1d18 am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA 
* commit '96f47f5bf3f498a7a85721de2e265d8fa3e9af26':
  Increase timeout when uncrypting OTA
 2015-03-26 04:08:24 +00:00
Michael Runge
96f47f5bf3 am b0197033: Increase timeout when uncrypting OTA 
* commit 'b019703395ae0304ddd10054843c64db87229d23':
  Increase timeout when uncrypting OTA
 2015-03-26 03:57:33 +00:00
Michael Runge
b019703395 Increase timeout when uncrypting OTA 
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.

Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)
 2015-03-26 03:01:02 +00:00
Jinsuk Kim
bd3deee37b CEC: Explicitly turn on screen for remote control passthrough 
Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.

Bug: 19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit 9b8507c52ae845c8eed9fd9952bf66538934b8fd)
 2015-03-26 02:01:11 +00:00
Filip Gruszczynski
70ef3af8d9 am 2493d947: am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 
* commit '2493d947241c209ad6fcd562e998c320ef4c596e':
  Don't use windowOutsetBottom for insets, depend on display padding only.
 2015-03-25 22:51:20 +00:00
Filip Gruszczynski
2493d94724 am 9001f14b: Merge "Don\'t use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 
* commit '9001f14b205aba4d9fa236611b122492b92d3b4a':
  Don't use windowOutsetBottom for insets, depend on display padding only.
 2015-03-25 22:43:02 +00:00
Filip Gruszczynski
9001f14b20 Merge "Don't use windowOutsetBottom for insets, depend on display padding only." into lmp-mr1-modular-dev 2015-03-25 22:37:38 +00:00
Amith Yamasani
17b03239d3 am 8562a7a1: am eedf2fe0: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit '8562a7a110a0b012c33047884594cd4c449b27d0':
  Fix NPE if FPE service does not exist.
 2015-03-25 22:32:52 +00:00
Amith Yamasani
8562a7a110 am eedf2fe0: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit 'eedf2fe04a94c13c4548082a3675c6888293ef4e':
  Fix NPE if FPE service does not exist.
 2015-03-25 22:25:51 +00:00
Amith Yamasani
eedf2fe04a am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 
* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.
 2015-03-25 22:19:20 +00:00
Amith Yamasani
0afd1905b5 Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev 2015-03-25 22:12:46 +00:00
Bryce Lee
dec133d5fd am 0ad58dec: am 5f11a1af: add correct exception throw declaration to isScreenBrightnessBoosted. 
* commit '0ad58deca1bea95ea052ec2c4257bdf62d53fd54':
  add correct exception throw declaration to isScreenBrightnessBoosted.
 2015-03-25 22:05:12 +00:00
Bryce Lee
0ad58deca1 am 5f11a1af: add correct exception throw declaration to isScreenBrightnessBoosted. 
* commit '5f11a1af572730567d9e35d6792a720585a268c6':
  add correct exception throw declaration to isScreenBrightnessBoosted.
 2015-03-25 20:33:53 +00:00
Alan Viverette
3a79e434a6 am a0d3d003: am 5fc9b336: Merge "Consider RTL layout in DPAD navigation in Gallery" 
* commit 'a0d3d003c858012f9c4af2b1f84227baacec49ce':
  Consider RTL layout in DPAD navigation in Gallery
 2015-03-25 20:25:19 +00:00
Chad Brubaker
b8d872fbde am 5a01999e: am 704aa5ae: Merge "Use correct tag type for RSA exponent" 
* commit '5a01999e7b89b6f7bb2880ca86219fac1e81450d':
  Use correct tag type for RSA exponent
 2015-03-25 20:19:27 +00:00
Chad Brubaker
6558d4e75e am ee468ea8: am 6326f964: Merge "Make application/client id an object" 
* commit 'ee468ea8812e29420e25e3d2f510fbee6086a8f8':
  Make application/client id an object
 2015-03-25 20:19:23 +00:00
Alan Viverette
a0d3d003c8 am 5fc9b336: Merge "Consider RTL layout in DPAD navigation in Gallery" 
* commit '5fc9b336ebb6fc224b3e77af388024dea029fbb3':
  Consider RTL layout in DPAD navigation in Gallery
 2015-03-25 20:18:37 +00:00
Chad Brubaker
5a01999e7b am 704aa5ae: Merge "Use correct tag type for RSA exponent" 
* commit '704aa5ae48b5c0ff3e330aba9611723840396fdb':
  Use correct tag type for RSA exponent
 2015-03-25 20:12:55 +00:00
Chad Brubaker
ee468ea881 am 6326f964: Merge "Make application/client id an object" 
* commit '6326f964769c603382ee6694b33954b4ff9b9a52':
  Make application/client id an object
 2015-03-25 20:12:49 +00:00
Alan Viverette
5fc9b336eb Merge "Consider RTL layout in DPAD navigation in Gallery" 2015-03-25 20:04:22 +00:00
Alex Klyubin
2faa736e7d am 6a7ac540: am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one." 
* commit '6a7ac540e16cdf6a499580177f4e47a7f39d8554':
  Framework's NetworkSecurityPolicy delegates to libcore's one.
 2015-03-25 19:49:41 +00:00
Chad Brubaker
c217adaf67 am 9db6e4d7: am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes" 
* commit '9db6e4d7a331f4e219d938074e50b2f9deca45f1':
  Enforce tag types in KeymasterArgument classes
 2015-03-25 19:49:35 +00:00
Alan Viverette
46c9531382 am ddb30cd3: am 7506f499: Merge "Fix to crash when clicking text link without view activity" 
* commit 'ddb30cd36f7a3e8a9369d5c1d735a6441c7c0216':
  Fix to crash when clicking text link without view activity
 2015-03-25 19:49:31 +00:00
Bryce Lee
c6d72c46f5 am a6045ec8: am 40a4f4a6: Implement isScreenBrightnessBoosted in BridgePowerManager. 
* commit 'a6045ec8ed8eb46454c260649abe2f4eb6fcb0f6':
  Implement isScreenBrightnessBoosted in BridgePowerManager.
 2015-03-25 19:49:02 +00:00
Chad Brubaker
704aa5ae48 Merge "Use correct tag type for RSA exponent" 2015-03-25 19:35:01 +00:00
Chad Brubaker
6326f96476 Merge "Make application/client id an object" 2015-03-25 19:25:55 +00:00
Alex Klyubin
6a7ac540e1 am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one." 
* commit 'a9f628662c348c5926caf5e2df0fd2f245a715bf':
  Framework's NetworkSecurityPolicy delegates to libcore's one.
 2015-03-25 19:03:34 +00:00
Chad Brubaker
9db6e4d7a3 am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes" 
* commit '5aeb085389954a32e1ea2189b7bec8080b0226c5':
  Enforce tag types in KeymasterArgument classes
 2015-03-25 19:03:28 +00:00
Alan Viverette
ddb30cd36f am 7506f499: Merge "Fix to crash when clicking text link without view activity" 
* commit '7506f499b523d05c6bca5acb6d83f55820d33771':
  Fix to crash when clicking text link without view activity
 2015-03-25 19:03:21 +00:00
Bryce Lee
5f11a1af57 add correct exception throw declaration to isScreenBrightnessBoosted. 
Change-Id: I9b861002d7719ad43643d68f6795df6938bd0fc3
 2015-03-25 11:51:39 -07:00
Bryce Lee
a6045ec8ed am 40a4f4a6: Implement isScreenBrightnessBoosted in BridgePowerManager. 
* commit '40a4f4a61fbb2172901eda763bf928ae9b1b5300':
  Implement isScreenBrightnessBoosted in BridgePowerManager.
 2015-03-25 18:51:05 +00:00
Bryce Lee
40a4f4a61f Implement isScreenBrightnessBoosted in BridgePowerManager. 
Change-Id: I7da132c7522e5c352e14123f059b900008d94c95
 2015-03-25 11:16:23 -07:00
Alex Klyubin
a9f628662c Merge "Framework's NetworkSecurityPolicy delegates to libcore's one." 2015-03-25 18:13:18 +00:00
Chad Brubaker
5aeb085389 Merge "Enforce tag types in KeymasterArgument classes" 2015-03-25 18:00:48 +00:00
Chris Craik
485c25ba46 am e3abfef6: am 82f6b16e: Merge "hwui : fix memory leak due to duplicate in shadow cache" 
* commit 'e3abfef62b7dcfa3ca44f133b19ed316a33a97c6':
  hwui : fix memory leak due to duplicate in shadow cache
 2015-03-25 16:47:41 +00:00
Alan Viverette
7506f499b5 Merge "Fix to crash when clicking text link without view activity" 2015-03-25 16:35:37 +00:00
Chris Craik
e3abfef62b am 82f6b16e: Merge "hwui : fix memory leak due to duplicate in shadow cache" 
* commit '82f6b16e10a116a42e32c99c34fb2d435da21fd5':
  hwui : fix memory leak due to duplicate in shadow cache
 2015-03-25 16:28:58 +00:00