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

153202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Charlton
8f802e569b am 74866adc: am adb87527: Merge "Remove startActivityFromInCall API" into lmp-dev 
* commit '74866adc5db2b900614894d31bb7821741949ca2':
  Remove startActivityFromInCall API
 2014-09-03 23:46:41 +00:00
Brian Carlstrom
965a23423b am 719da919: am c74dc4b7: Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 
* commit '719da919d21538cc145e372a68955e6b87cf6681':
  Restrict lazy dexopt to eng builds only
 2014-09-03 23:46:35 +00:00
Wink Saville
bbb6f8503b am 1a9c704c: am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev 
* commit '1a9c704c1991417a45cc587b3e118eb98f87e39a':
  Rename getActivatedXxx to getActiveXxx
 2014-09-03 23:46:29 +00:00
Matthew Xie
2e0c5d32c3 am 59cd77e9: am 0465993a: Merge "Close the base socket when bindListen fails" into lmp-dev 
* commit '59cd77e9258e2604020b54b7df7c0a78ffe68ddb':
  Close the base socket when bindListen fails
 2014-09-03 23:46:17 +00:00
Paul Jensen
71f080f1e8 am 6df10322: am bacfc3d4: Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 
* commit '6df10322461de68fa14363f63d336495f2531f6c':
  Use alarm rather than delayed message to end lingering.
 2014-09-03 23:45:45 +00:00
Nancy Chen
e5586a537e am aad08cf6: am 6ad18828: Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev 
* commit 'aad08cf64d39349265a67084ea0750a27cd8103f':
  Remove onConnectionAdded/Removed() from ConnectionService API
 2014-09-03 23:45:40 +00:00
Glenn Kasten
809a397e0a am c39dfd87: am 57d76e43: Merge "Fix regression in CTS for AudioTrack" into lmp-dev 
* commit 'c39dfd87ca25186bcb851070d6e8fca281d2ff4f':
  Fix regression in CTS for AudioTrack
 2014-09-03 23:45:36 +00:00
Alan Viverette
f8cf4cdf90 am 1f211a18: am 3778a6aa: Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 
* commit '1f211a187fe60814f2b7729919600fb30c93475b':
  Remove partial support for hotspot changes on focus movement
 2014-09-03 23:45:30 +00:00
Wink Saville
aac8a88b57 am 915ed392: am dadcc85e: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit '915ed3923be1eb5973addeaf7596ba24abc38bc1':
  Prepare to make SubscriptionManager public.
 2014-09-03 23:45:25 +00:00
Nick Kralevich
fe0fed54a4 am ad0a66ac: am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests"" 
* commit 'ad0a66acf4a28646bd1a0060736cdb8e7d9712a4':
  Revert "SELinuxMMAC unit tests"
 2014-09-03 20:20:34 +00:00
Evan Charlton
147fb18db7 am adb87527: Merge "Remove startActivityFromInCall API" into lmp-dev 
* commit 'adb8752767b5ac1a35b0d239e550c6b39b81f771':
  Remove startActivityFromInCall API
 2014-09-03 20:16:51 +00:00
Nick Kralevich
ad0a66acf4 am c1ce74ca: Merge "Revert "SELinuxMMAC unit tests"" 
* commit 'c1ce74cab0e83d574df1bd7bb7b7eb16eec171f6':
  Revert "SELinuxMMAC unit tests"
 2014-09-03 20:14:31 +00:00
Brian Carlstrom
2803b6854b am c74dc4b7: Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 
* commit 'c74dc4b73b59f41b25e78a4f7970546dfa3c25dc':
  Restrict lazy dexopt to eng builds only
 2014-09-03 20:09:00 +00:00
Evan Charlton
4d12a03771 Merge "Remove startActivityFromInCall API" into lmp-dev 2014-09-03 20:07:47 +00:00
Nick Kralevich
c1ce74cab0 Merge "Revert "SELinuxMMAC unit tests"" 2014-09-03 20:04:27 +00:00
Nick Kralevich
01a5aa95d9 Revert "SELinuxMMAC unit tests" 
Broken build.

frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:89: error: constructor PackageParser in class PackageParser cannot be applied to given types;
        PackageParser packageParser = new PackageParser(archiveFilePath);
                                      ^
  required: no arguments
  found: String
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:93: error: method parsePackage in class PackageParser cannot be applied to given types;
        PackageParser.Package pkg = packageParser.parsePackage(sourceFile,
                                                 ^
  required: File,int
  found: File,String,DisplayMetrics,int
  reason: actual and formal argument lists differ in length
frameworks/base/services/tests/servicestests/src/com/android/server/pm/SELinuxMMACTests.java:99: error: incompatible types
        boolean savedCerts = packageParser.collectCertificates(pkg, 0);
                                                              ^
  required: boolean
  found:    void
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
3 errors
make: *** [out/target/common/obj/APPS/FrameworksServicesTests_intermediates/classes-full-debug.jar] Error 41

This reverts commit 2f446561f2f6d1b320b34432854d2f55e5b56f9e.

Change-Id: I0aa992d7b9eccce7e38c430a8a96084a6ee99866
 2014-09-03 20:03:17 +00:00
Brian Carlstrom
e7a2138635 Merge "Restrict lazy dexopt to eng builds only" into lmp-dev 2014-09-03 20:02:42 +00:00
Wink Saville
d8ca408420 am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev 
* commit '3c95cae1ab33a0fd3bd93422e91a8182bf49d017':
  Rename getActivatedXxx to getActiveXxx
 2014-09-03 19:57:53 +00:00
Wink Saville
baaa4ef6f0 Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev 2014-09-03 19:50:55 +00:00
Matthew Xie
46247d56df am 0465993a: Merge "Close the base socket when bindListen fails" into lmp-dev 
* commit '0465993a8c0ddec88311db561b1220786150344a':
  Close the base socket when bindListen fails
 2014-09-03 19:36:10 +00:00
Matthew Xie
ddfa8e18fd Merge "Close the base socket when bindListen fails" into lmp-dev 2014-09-03 19:29:03 +00:00
Matthew Xie
726652e9d3 Close the base socket when bindListen fails 
Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2
 2014-09-03 19:25:39 +00:00
Paul Jensen
00f0ced3d2 am bacfc3d4: Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 
* commit 'bacfc3d4d9cb50d08035b54529612806e4bd055e':
  Use alarm rather than delayed message to end lingering.
 2014-09-03 19:24:33 +00:00
Nancy Chen
17b1f9138a am 6ad18828: Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev 
* commit '6ad1882879c9e537d85079d6a13a6a5c50ba5900':
  Remove onConnectionAdded/Removed() from ConnectionService API
 2014-09-03 19:24:23 +00:00
Glenn Kasten
65137ae765 am 57d76e43: Merge "Fix regression in CTS for AudioTrack" into lmp-dev 
* commit '57d76e43874309a15d3910bf5e151b4d671e7d3c':
  Fix regression in CTS for AudioTrack
 2014-09-03 19:23:35 +00:00
Alan Viverette
79464269aa am 3778a6aa: Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 
* commit '3778a6aa6069dae2e7f012732f47c6a7e5196364':
  Remove partial support for hotspot changes on focus movement
 2014-09-03 19:23:15 +00:00
Wink Saville
7d725d3919 am dadcc85e: Merge "Prepare to make SubscriptionManager public." into lmp-dev 
* commit 'dadcc85e58bcf2389ebca0956e044fc8ccfcab09':
  Prepare to make SubscriptionManager public.
 2014-09-03 19:23:10 +00:00
Wink Saville
8a38a203a9 Rename getActivatedXxx to getActiveXxx 
Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
 2014-09-03 12:22:54 -07:00
Paul Jensen
1f0ce33821 Merge "Use alarm rather than delayed message to end lingering." into lmp-dev 2014-09-03 19:08:16 +00:00
Brian Carlstrom
230561eef4 Restrict lazy dexopt to eng builds only 
Bug: 16696554
Change-Id: I56bb63ce534842994a70df6b09843b4e3153c845
 2014-09-03 11:59:38 -07:00
Nancy Chen
8a34d9ed2a Merge "Remove onConnectionAdded/Removed() from ConnectionService API" into lmp-dev 2014-09-03 18:41:21 +00:00
John Reck
842bb5be58 am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit '0f6c29dc47d4a9607e79480460a67837c527fd56':
  Have destroy call freePrefetchedLayers
 2014-09-03 18:33:24 +00:00
Tyler Gunn
2267c2ee12 am c1945d0b: am 5cc214b6: Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 
* commit 'c1945d0beca08931f410a522d42b5984db21a91f':
  Add supported URI scheme to PhoneAccounts. (1/4)
 2014-09-03 18:33:19 +00:00
Glenn Kasten
49367a367c Merge "Fix regression in CTS for AudioTrack" into lmp-dev 2014-09-03 18:31:59 +00:00
Alan Viverette
94b88e7103 Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 2014-09-03 18:31:47 +00:00
Wink Saville
7f6fa2a1cd Merge "Prepare to make SubscriptionManager public." into lmp-dev 2014-09-03 18:25:45 +00:00
John Reck
4d54d7f4cd am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit 'ef908af6ba2fe85b244e02a16936b53acdf2931f':
  Have destroy call freePrefetchedLayers
 2014-09-03 18:22:39 +00:00
Tyler Gunn
5ca43a9a0c am 5cc214b6: Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 
* commit '5cc214b6c7294df1d0f030ced977e51768eec589':
  Add supported URI scheme to PhoneAccounts. (1/4)
 2014-09-03 18:22:34 +00:00
John Reck
2d72dd2e3e Merge "Have destroy call freePrefetchedLayers" into lmp-dev 2014-09-03 18:18:31 +00:00
Tsuwei Chen
721153d388 am b73f77cd: am 09e97495: Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev 
* commit 'b73f77cdca6dccf89cfa7a878e59c8528893cae7':
  Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7
 2014-09-03 18:14:36 +00:00
Christoph Studer
50f33e5716 am df3b9134: am ccf36a07: Merge "SysUI: Suppress HUNs from non-profile users" into lmp-dev 
* commit 'df3b91348bbe6aac1037be2f861a4c59d93674b3':
  SysUI: Suppress HUNs from non-profile users
 2014-09-03 18:14:31 +00:00
Matthew Williams
61dd95f7ba am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit '3e3a7489f074b5f2234d32499cdf229da6562d46':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:14:26 +00:00
John Reck
17035b0211 Have destroy call freePrefetchedLayers 
Bug: 17208461

 There's a potential race condition between HardwareRenderer.destroy()
 being called (which calls destroyCanvasAndSurface()) and the renderer
 being finalized (which is what calls freePrefetchedLayers), during which
 time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
 context.

 Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
 into destroyCanvasAndSurface() where they should have been in the first
 place.

 Also, if we hit the assertion failure, dump the current state of
 Caches to try and provide more context for the failure.

Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
 2014-09-03 11:13:53 -07:00
Tyler Gunn
65bd3eaad6 Merge "Add supported URI scheme to PhoneAccounts. (1/4)" into lmp-dev 2014-09-03 18:12:58 +00:00
Nick Kralevich
01168beebc am 7f534190: am 3d4cfc04: Merge "SELinuxMMAC unit tests" 
* commit '7f534190d629ac21adce0b3f3f74597e63cd3238':
  SELinuxMMAC unit tests
 2014-09-03 18:08:31 +00:00
Tsuwei Chen
65d52cec51 am 09e97495: Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev 
* commit '09e97495ff236ce01f46ba9291048e01b27a27ea':
  Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7
 2014-09-03 18:02:44 +00:00
Christoph Studer
dfee554fbc am ccf36a07: Merge "SysUI: Suppress HUNs from non-profile users" into lmp-dev 
* commit 'ccf36a07417ba51d4bfa04edd2138dadadfe4923':
  SysUI: Suppress HUNs from non-profile users
 2014-09-03 18:02:38 +00:00
Matthew Williams
a9577a8f0e am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit 'f390c6ac2f65573e863fb563ded7ecdb3e839be4':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:02:33 +00:00
Jason Monk
37a5bd8be8 am 874fff78: am b0b16c1e: Merge "Add lock task checking to moving tasks to back" into lmp-dev 
* commit '874fff781a60f77b7df030d932c4fb340086368d':
  Add lock task checking to moving tasks to back
 2014-09-03 18:01:30 +00:00
Nick Kralevich
7f534190d6 am 3d4cfc04: Merge "SELinuxMMAC unit tests" 
* commit '3d4cfc04a7bc882d534a49dfb475180907fcf842':
  SELinuxMMAC unit tests
 2014-09-03 18:01:15 +00:00