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

214273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
3bbce141f7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 27293916
Change-Id: Ie9866ed4959a6a29e47ff93f9d66bc25dbb52591
 2016-02-23 13:46:04 -08:00
Wale Ogunwale
2850a42a9f Merge "Make accessing mWaitingForDrawn thread-safe" 
am: f0cf899033

* commit 'f0cf8990330dd592b114374ad15b75bc01f69e47':
  Make accessing mWaitingForDrawn thread-safe
 2016-02-23 15:39:45 +00:00
Wale Ogunwale
f0cf899033 Merge "Make accessing mWaitingForDrawn thread-safe" 2016-02-23 15:34:53 +00:00
Jason Monk
c3eb211b70 Merge "Fix NPE in BaseStatusbar in onListenerConnected" 
am: ffef959ca4

* commit 'ffef959ca4e2607a3e4e3f0f23e4aaa3e1b3aafa':
  Fix NPE in BaseStatusbar in onListenerConnected
 2016-02-23 13:55:28 +00:00
Jason Monk
ffef959ca4 Merge "Fix NPE in BaseStatusbar in onListenerConnected" 2016-02-23 13:51:22 +00:00
tiger_huang
53d1e66080 Make accessing mWaitingForDrawn thread-safe 
mWaitingForDrawn can be accessed by multiple threads, but it was not
protected by the mWindowMap lock perfectly.

Change-Id: I128ba1a00f40af83b051c0d1df4350d0635a9dff
 2016-02-23 20:34:52 +08:00
Neil Fuller
ed60fbf9c4 Merge "Add stubs needed to enable javac to compile lambdas" 
am: 5af6dd5463

* commit '5af6dd5463e52350988b3f096a4ffc07f3bc8a22':
  Add stubs needed to enable javac to compile lambdas
 2016-02-23 12:00:48 +00:00
Neil Fuller
5af6dd5463 Merge "Add stubs needed to enable javac to compile lambdas" 2016-02-23 11:55:09 +00:00
Neil Fuller
613a907045 Add stubs needed to enable javac to compile lambdas 
This enables framework.jar code to include lambdas.
framework.jar is still built with javac (as well as
jack) for things like doclava.

Bug: 26753820
(cherry picked from commit 801f90e61b971984c92767acd6fb62d56911664b)

Change-Id: Icdc9e003b09bd1e14e991b32934b3c4c4a268b1a
 2016-02-23 10:03:09 +00:00
Kent Persson
185e9c2562 Fix NPE in BaseStatusbar in onListenerConnected 
If NotificationListenerService is not bound the
getActiveNotifications function will return null.
This will result in a Nullpointer exception in BaseStatusbar
onListenerConnected if it is called. A Nullpointer check was
added in onListenerConnected to avoid this Nullpointer exception.

Change-Id: I0aec040f11101e8f7b5863879b3774dc2bb6ce2b
 2016-02-23 10:36:59 +01:00
Chien-Yu Chen
660162b8ee Merge "Camera2: Fix getInternalFormatSizes for depth" 
am: b999ad9eed

* commit 'b999ad9eed912873feb3fc143f99ba87745d3e06':
  Camera2: Fix getInternalFormatSizes for depth
 2016-02-23 01:25:11 +00:00
Chien-Yu Chen
b999ad9eed Merge "Camera2: Fix getInternalFormatSizes for depth" 2016-02-23 01:10:27 +00:00
Chien-Yu Chen
5f1245b993 Camera2: Fix getInternalFormatSizes for depth 
All depth formats are considered as non-high-res. Also compare depth
minimum frame durations instead of regular minimum frame durations
for depth formats.

Bug: 26687093
Change-Id: I65b691fe450077b0e3ace15f6ac0289b41caf42f
 2016-02-22 14:29:53 -08:00
Andreas Gampe
dcb4956ad1 Merge "Preload2: Fix object to sync on" 
am: de38445284

* commit 'de384452846c1f84ce9d88b470f0ca5129446055':
  Preload2: Fix object to sync on
 2016-02-22 18:11:00 +00:00
Andreas Gampe
de38445284 Merge "Preload2: Fix object to sync on" 2016-02-22 18:00:50 +00:00
Narayan Kamath
fabbf9f78d Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d." 
am: 0a1b294f68

* commit '0a1b294f68355ed118d9c8b71e7688a698483378':
  Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.
 2016-02-22 11:54:47 +00:00
Narayan Kamath
0a1b294f68 Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d." 2016-02-22 11:45:55 +00:00
Narayan Kamath
4b1e153716 Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d. 
bug: 27186457

Change-Id: I257eb422d6edcc1c52fc948995569fba6baf594f
 2016-02-22 11:44:10 +00:00
Andreas Gampe
f2a9933fa7 Preload2: Fix object to sync on 
When moving to sync on the right objects, these waits() have been
forgotten.

Change-Id: I61b0d3c5cc41b7f46fbdd3099ec44221e653001a
 2016-02-19 09:24:43 -08:00
Neil Fuller
6b6d8426fe Fix a bad merge 
There was a bad interaction between
commits 6777f54fa44341dd4b23456c97d97c6e4ffe915f
and 23e47f5621271db9b84f53f15a3e3d81d8b8b48d.

Change-Id: Ic408f8b4859d83d89c612748ee6e772b57830d96
 2016-02-19 16:50:14 +00:00
Neil Fuller
e3ced5b642 Merge "Add flags needed to switch Jack to 1.8 for CTS targets" 
am: b97cfe8076

* commit 'b97cfe8076c903ab32f4e4cf1c2646817cbd5dc5':
  Add flags needed to switch Jack to 1.8 for CTS targets
 2016-02-19 11:55:16 +00:00
Neil Fuller
b97cfe8076 Merge "Add flags needed to switch Jack to 1.8 for CTS targets" 2016-02-19 11:49:18 +00:00
Neil Fuller
855585f3c9 Add flags needed to switch Jack to 1.8 for CTS targets 
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
Change-Id: I640b2ae6eeec17cab5cbc0bf7a4d54c4e4d35ccd
 2016-02-19 11:46:19 +00:00
Neil Fuller
1f87f1e971 Merge changes from topic \'java_util_function_tests\' 
am: 6b50207596

* commit '6b5020759651d1ed4d9f25ce3ab1e7c360b02fe7':
  Add flags needed to switch Jack to 1.8 for CTS targets
  Add flags needed to switch Jack to 1.8 for CTS targets
 2016-02-19 10:34:14 +00:00
Neil Fuller
6b50207596 Merge changes from topic 'java_util_function_tests' 
* changes:
  Add flags needed to switch Jack to 1.8 for CTS targets
  Add flags needed to switch Jack to 1.8 for CTS targets
 2016-02-19 10:28:30 +00:00
Colin Cross
bd45c08468 Merge "Add dumpsys meminfo --unreachable" 
am: 916ea08119

* commit '916ea081196a47ef3257910a71fa7a7ac609ddb1':
  Add dumpsys meminfo --unreachable
 2016-02-19 06:14:50 +00:00
Colin Cross
916ea08119 Merge "Add dumpsys meminfo --unreachable" 2016-02-19 06:10:36 +00:00
Neil Fuller
0a2f80bacd Merge "Add java.util.function APIs" 
am: 1818ef08a0

* commit '1818ef08a033f0f616524766bf2db009b4e30dd7':
  Add java.util.function APIs
 2016-02-18 18:20:02 +00:00
Neil Fuller
dce343dc41 Add flags needed to switch Jack to 1.8 for CTS targets 
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
(cherry-picked from commit a835180b74af2cad853db08e8d41a7b04773759b)

Change-Id: I2be4db6788b14558f74534c24bb007f7fb8b6b67
 2016-02-18 14:16:59 +00:00
Neil Fuller
eb09c6a984 Add flags needed to switch Jack to 1.8 for CTS targets 
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.

"core-tests" includes 1.8 language features.

Bug: 27113322
Bug: 26953739
(cherry-picked from commit 3269825f0be29ec8ea08e0b7930d801f3d0206b4)

Change-Id: I294b50edb898699b57684eaf25016553338cb6a2
 2016-02-18 14:09:41 +00:00
Neil Fuller
1818ef08a0 Merge "Add java.util.function APIs" 2016-02-18 13:32:30 +00:00
Neil Fuller
2b548ae7ae Add java.util.function APIs 
Bug: 26814204
(cherry-picked from commit 311a97e7f41c494bc355f5d77adc276e2a400970)

Change-Id: Id00ac095e45dbdc63e9542f4f3a20c2179c3ab72
 2016-02-18 11:39:09 +00:00
Michael Wright
605d619b1e Merge "Add keylayout for Xbox One controller" 
am: 7416762be0

* commit '7416762be023e31b86bc71210c963d43522dedc5':
  Add keylayout for Xbox One controller
 2016-02-17 22:46:36 +00:00
Michael Wright
7416762be0 Merge "Add keylayout for Xbox One controller" 2016-02-17 22:37:22 +00:00
Bill Yi
2528fcdfbd Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD 
Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7
 2016-02-17 11:38:55 -08:00
Miao Wang
e2fc25722a Merge "[RenderScript] Fix potential leak in RS JNI" 2016-02-17 18:50:54 +00:00
Tim Clark
66a25396b0 Add keylayout for Xbox One controller 
Change-Id: Ifb4005ed7b6345c9af126d8f1bd22c7e2921871f
 2016-02-17 17:26:06 +00:00
Yohann Roussel
3289547de4 Merge "Suppress warnings of MultiDexLegacyAndException" 2016-02-17 15:15:57 +00:00
Yohann Roussel
d183f80687 Suppress warnings of MultiDexLegacyAndException 
To clean build logs without disturbing the test.

Bug: 27155813


Change-Id: If80d7ad044dc9b4dfde5ded332e9ba566e536054
 2016-02-17 15:15:15 +00:00
Sami Tolvanen
dcc79d83cb Merge "Support persist.sys.audit_safemode" 2016-02-16 21:52:13 +00:00
Andreas Gampe
a1e8ceb50b Merge "Frameworks/base: Fix registration function" 2016-02-16 20:41:30 +00:00
Andreas Gampe
8d48ef39db Frameworks/base: Fix registration function 
Registration functions return "int."

(cherry picked from commit faa1033dc7d6b1ea6c17a483e586eaa167d154f9)

Change-Id: Icb8d35f3bc23794cdb22db1c1adda236c9d8676e
 2016-02-16 11:54:48 -08:00
Dimitry Ivanov
140d7d27f1 Merge "Add missing liblog dependency" 2016-02-13 01:03:41 +00:00
Dimitry Ivanov
5a06e3747d Add missing liblog dependency 
Bug: http://b/27171986
Change-Id: I40b93ac0d4bfacfc38c08b5dbc5d2b3358a976cb
 2016-02-12 16:44:33 -08:00
Amith Yamasani
c7f3631fbe Merge "When the device boots up, netd works more than required" 2016-02-12 18:35:11 +00:00
Amith Yamasani
b96673847a Merge "onAccountsUpdated shouldn't be called back after listener unregistered" 2016-02-12 17:50:17 +00:00
Miao Wang
a4ad5f8401 [RenderScript] Fix potential leak in RS JNI 
Bug: 27145639
Change-Id: I80cf2971d803a3366a63caa3612a503a88639040
 2016-02-11 12:34:35 -08:00
Przemyslaw Szczepaniak
2c97ab6ee0 Merge "Hide java.security.Signatue#getCurrentSpi" 2016-02-11 13:27:47 +00:00
Przemyslaw Szczepaniak
b1d6d8d234 Hide java.security.Signatue#getCurrentSpi 
Internal implementation detail, shouldn't
be public.

Bug: 26689841
Change-Id: Ie0b7f9fc2659cb21f58f59c17df52c83e025a87c
 2016-02-11 11:56:21 +00:00
Przemyslaw Szczepaniak
29fa8967e2 Merge "Remove java.nio.channels.* classes without test coverage." 2016-02-11 10:06:55 +00:00