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

213723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
f1df0f59c1 Merge "Fix memory leak in HWUI" 
am: 85b010b826

* commit '85b010b826129cd1a2090daa533e843b5573aea4':
  Fix memory leak in HWUI
 2015-12-11 12:48:28 -08:00
Dimitry Ivanov
e3ca5ac40d Merge "Use nativeloader to load NativeActivity" 
am: 317456bc52

* commit '317456bc520549cbc1ac4ad102df8b0d22b22a99':
  Use nativeloader to load NativeActivity
 2015-12-11 12:41:22 -08:00
John Reck
85b010b826 Merge "Fix memory leak in HWUI" 2015-12-11 20:37:36 +00:00
Dimitry Ivanov
317456bc52 Merge "Use nativeloader to load NativeActivity" 2015-12-11 20:30:32 +00:00
Christopher Tate
5c3370d4f8 Don\'t back up / restore EAP network definitions am: a89f9d93cb 
am: d735fbb3af

* commit 'd735fbb3af31f43a5bc99c52b61b20b7218b076f':
  Don't back up / restore EAP network definitions
 2015-12-11 11:50:22 -08:00
Christopher Tate
d735fbb3af Don\'t back up / restore EAP network definitions 
am: a89f9d93cb

* commit 'a89f9d93cbda665259812e990bca1045bd8abf9f':
  Don't back up / restore EAP network definitions
 2015-12-11 11:37:19 -08:00
Dmitriy Ivanov
6f06ad7df1 Use nativeloader to load NativeActivity 
System apps are the exception and they can
access internal platform libraries (this
is needed for bundled apps to work correctly).

Also fix the way NativeActivity loads the native
library to correspond to the way BaseDexClassloader
does it.

Bug: http://b/22548808
Bub: http://b/25777936
Change-Id: Idc94cdded182ea2cb1cbebc76c336cc3394c7ebe
 2015-12-11 10:44:16 -08:00
Chad Brubaker
14cf68c284 Merge "Add null check to getConfigForHostname" 
am: fe1eac7a19

* commit 'fe1eac7a19b827af71c503df6aefc59076a30928':
  Add null check to getConfigForHostname
 2015-12-11 10:16:26 -08:00
Chad Brubaker
fe1eac7a19 Merge "Add null check to getConfigForHostname" 2015-12-11 18:02:34 +00:00
Sangkyu Lee
441cc421b5 Fix memory leak in HWUI 
std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.

Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
 2015-12-11 16:05:10 +09:00
Christopher Tate
a89f9d93cb Don't back up / restore EAP network definitions 
Bug 25725016

Cherrypick from AOSP.

Change-Id: I6aa11a76e7724a0aaad05a1aa074afa2c429370c
 2015-12-10 18:23:22 -08:00
Chad Brubaker
9613157d5e Add null check to getConfigForHostname 
bug: 26144676
Change-Id: I18f50940846f1ce8109560c63ce2a87ce084d9e5
 2015-12-10 18:12:59 -08:00
Dianne Hackborn
ba6295d8ed Work on issue #25467052: System lagged out am: 022c748f54 
am: 9ba6eb9989

* commit '9ba6eb9989b90691c45017be08b1ee453c370424':
  Work on issue #25467052: System lagged out
 2015-12-10 16:33:14 -08:00
Dianne Hackborn
9ba6eb9989 Work on issue #25467052: System lagged out 
am: 022c748f54

* commit '022c748f54626f77f01079595a0100d1d145f383':
  Work on issue #25467052: System lagged out
 2015-12-10 16:26:55 -08:00
Dianne Hackborn
022c748f54 Work on issue #25467052: System lagged out 
Add a new mechanism where we retain previously used provided
processes in the "last activity" oom adj state for 20 seconds,
before allowing them to fall down to a regular cached process.
This should help reduce thrashing when something is acquiring
and releasing a provider repeatedly.

Change-Id: I889472de7bb4da574b46f07e36a99978813643cb
 2015-12-10 15:14:46 -08:00
Adam Lesinski
0b754d122c Prevent DivideByZero error in BatteryStatsImpl am: ba88e68fe4 
am: 4e4ff058c1

* commit '4e4ff058c1a0b4b77f468a206a790bb6f084f616':
  Prevent DivideByZero error in BatteryStatsImpl
 2015-12-10 14:54:38 -08:00
Adam Lesinski
4e4ff058c1 Prevent DivideByZero error in BatteryStatsImpl 
am: ba88e68fe4

* commit 'ba88e68fe47b66f1fc5d10c15f04f20fe662399e':
  Prevent DivideByZero error in BatteryStatsImpl
 2015-12-10 14:47:09 -08:00
Matthew Williams
1db19fc70e Merge "ConcurrentModificationException in SyncManager" 
am: 7e4d92fbc7

* commit '7e4d92fbc7761d561c1bc61dc5cf55b69d3a54f3':
  ConcurrentModificationException in SyncManager
 2015-12-10 10:16:19 -08:00
Matthew Williams
7e4d92fbc7 Merge "ConcurrentModificationException in SyncManager" 2015-12-10 18:04:44 +00:00
Adam Lesinski
ba88e68fe4 Prevent DivideByZero error in BatteryStatsImpl 
It was assumed that when a UID had either rx or tx bytes/packets that it would
have the other as well.

Bug:25706750
Change-Id: Iefac59a6bd02876aed9a0bac218d187b81807a95
 2015-12-10 00:48:24 +00:00
Bryce Lee
0a8c81a204 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a am: 180dd72a9b 
am: a83d518689

* commit 'a83d5186898c49888f9b3c1d2ef2333d297d8449':
  Improve logging in BluetoothHeadsetClientCall.
 2015-12-09 15:07:23 -08:00
Bryce Lee
a83d518689 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a 
am: 180dd72a9b

* commit '180dd72a9b36ca6f74e5ad255347d815a0c8729a':
  Improve logging in BluetoothHeadsetClientCall.
 2015-12-09 15:01:13 -08:00
Bryce Lee
180dd72a9b Improve logging in BluetoothHeadsetClientCall. 
am: 3c67873f0a

* commit '3c67873f0a20a958f6cf1ccccb472fa050bf55b7':
  Improve logging in BluetoothHeadsetClientCall.
 2015-12-09 22:54:19 +00:00
Eino-Ville Talvala
6fa9cc1bd3 Merge "Replace hard-coded errno values with OsConstants" 
am: cb299b858f

* commit 'cb299b858f4f073e2abd4ad45aa944dc0dfd0aa2':
  Replace hard-coded errno values with OsConstants
 2015-12-09 21:25:15 +00:00
Eino-Ville Talvala
cb299b858f Merge "Replace hard-coded errno values with OsConstants" 2015-12-09 21:14:21 +00:00
Chad Brubaker
5a12cf5cb7 Merge "Use a custom TrustedCertificateStore" 
am: 95f15495a2

* commit '95f15495a2e3d8591fe4eeb25ae55e88da783274':
  Use a custom TrustedCertificateStore
 2015-12-09 21:07:18 +00:00
Chad Brubaker
f1870eee34 Merge "Expose findByIssuerAndSignature" 
am: b27d820920

* commit 'b27d8209206e0aad76a257636417341c6f69fbb5':
  Expose findByIssuerAndSignature
 2015-12-09 21:05:50 +00:00
Chad Brubaker
95f15495a2 Merge "Use a custom TrustedCertificateStore" 2015-12-09 20:53:01 +00:00
Chad Brubaker
b27d820920 Merge "Expose findByIssuerAndSignature" 2015-12-09 20:52:50 +00:00
Chad Brubaker
cea1cf0185 Merge "Refactor NetworkSecurityPolicy to be pluggable" 
am: 224318aa13

* commit '224318aa13ad5b78d19087cc42dcbe2ae0bd0c3f':
  Refactor NetworkSecurityPolicy to be pluggable
 2015-12-09 18:54:06 +00:00
Chad Brubaker
224318aa13 Merge "Refactor NetworkSecurityPolicy to be pluggable" 2015-12-09 18:40:55 +00:00
Christopher Wiley
b7b3415899 Merge "Rethrow remote\'s ServiceSpecificException" 
am: 85eaca25fe

* commit '85eaca25fe2a89f883e9a87d8f411cfb315f3e03':
  Rethrow remote's ServiceSpecificException
 2015-12-08 23:26:40 +00:00
Christopher Wiley
85eaca25fe Merge "Rethrow remote's ServiceSpecificException" 2015-12-08 23:15:52 +00:00
Chad Brubaker
6568cf185d Refactor NetworkSecurityPolicy to be pluggable 
This allows us to keep the logic for the NetworkSecurityPolicy in the
framework instead of in libcore.

Change-Id: I4bf494f79c27729cb17d93d90a91319492270ce9
 2015-12-08 13:38:43 -08:00
Bryce Lee
3c67873f0a Improve logging in BluetoothHeadsetClientCall. 
Bug: 26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
 2015-12-08 11:22:31 -08:00
Paul Duffin
e94e7dd181 Merge "Remove framework from LOCAL_JAVA_LIBRARIES" am: e252149ab9 
am: ec9081a004

* commit 'ec9081a004db058bb5ada5173d65a565e2005c6d':
  Remove framework from LOCAL_JAVA_LIBRARIES
 2015-12-08 06:18:30 -08:00
Paul Duffin
d441dca72b Merge "Follow-up to Switch to the latest version of Caliper" am: 80d5bef6f9 
am: 0ec9daecc6

* commit '0ec9daecc6129529fc6f2d66c29876eca88c492f':
  Follow-up to Switch to the latest version of Caliper
 2015-12-08 06:17:03 -08:00
Paul Duffin
ec9081a004 Merge "Remove framework from LOCAL_JAVA_LIBRARIES" 
am: e252149ab9

* commit 'e252149ab99a008a0a75734326755cadd5c5ee7a':
  Remove framework from LOCAL_JAVA_LIBRARIES
 2015-12-08 14:11:45 +00:00
Paul Duffin
0ec9daecc6 Merge "Follow-up to Switch to the latest version of Caliper" 
am: 80d5bef6f9

* commit '80d5bef6f9da4a0eeb23c3356843351170553df6':
  Follow-up to Switch to the latest version of Caliper
 2015-12-08 14:10:09 +00:00
Paul Duffin
e252149ab9 Merge "Remove framework from LOCAL_JAVA_LIBRARIES" 2015-12-08 14:04:29 +00:00
Paul Duffin
80d5bef6f9 Merge "Follow-up to Switch to the latest version of Caliper" 2015-12-08 14:03:10 +00:00
Paul Duffin
b12a3fca7e Remove framework from LOCAL_JAVA_LIBRARIES 
After previous change removed LOCAL_NO_STANDARD_LIBRARIES:=true
it is no longer necessary to explicitly add framework to
LOCAL_JAVA_LIBRARIES as it is added automatically by the build.

Change-Id: I68bf700375e34a10302f76d7463110755b815f85
 2015-12-08 13:59:36 +00:00
Andreas Gampe
32f4043ac3 Follow-up to Switch to the latest version of Caliper 
Remove LOCAL_NO_STANDARD_LIBRARIES.

(cherry pick from commit c9d6a91cd51a9b7ff00187914fe922b0d22b3d66)

Bug: 24848946
Change-Id: I19feea042c9b4823d4979f4d951476792600edbc
 2015-12-08 13:58:08 +00:00
振淦王
60a7431816 ConcurrentModificationException in SyncManager 
updateRunningAccounts and dispatchSyncOperation is running in different thread,
and mActiveSyncContexts not synchronization.
If methods occur together,
mActiveSyncContexts change may occur when cycle is running.

Sample:
https://code.google.com/p/android/issues/detail?id=195341

Solution:
Offboard the traversal from the main thread to the handler thread.

Change-Id: Ifb9fbb466a5087186be31f7877c50b8c8b6737e4
Signed-off-by: wangzhengan <wangzglx@gmail.com>
 2015-12-08 21:40:27 +08:00
Neil Fuller
4135a54df9 Merge "Add ICU4J APIs for Android" am: cb02371ca7 
am: ec1349df9c

* commit 'ec1349df9c1759ca728fc637738592902f2aa44b':
  Add ICU4J APIs for Android
 2015-12-08 10:56:41 +00:00
Michael Wright
37c8bcbcc9 Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c 
am: 4d9e6190b1

* commit '4d9e6190b186f1d2e1cd25defd0d6e12dd833b38':
  Add support for locking the screen when the lid is closed
 2015-12-08 10:55:07 +00:00
Neil Fuller
ec1349df9c Merge "Add ICU4J APIs for Android" 
am: cb02371ca7

* commit 'cb02371ca70a81796c75bd3bbf88478caf6ea7b7':
  Add ICU4J APIs for Android
 2015-12-08 10:47:59 +00:00
Neil Fuller
cb02371ca7 Merge "Add ICU4J APIs for Android" 2015-12-08 10:42:51 +00:00
Prashant Malani
54909b8e6b Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 am: 6344cb8144 
am: 3ebd5ceb90

* commit '3ebd5ceb90137572262efeda12cdce4b503ddded':
  Add rotary encoder input source
 2015-12-08 01:43:27 +00:00
Prashant Malani
3ebd5ceb90 Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 
am: 6344cb8144

* commit '6344cb8144647e4e49bc69cbf34a084ca7712115':
  Add rotary encoder input source
 2015-12-08 01:37:05 +00:00