OSDN Git Service
Calin Juravle [Tue, 8 Mar 2016 15:50:19 +0000 (15:50 +0000)]
Update DexFile.getDexOptNeeded in framework
Partial cherry pick from commit
693f997cc8b8c2ba8d3ed29627b2641dd86392a5
Change-Id: I0fe34541e3cf77fb6e6dbe689b7cf55cb78dbe05
Calin Juravle [Tue, 8 Mar 2016 13:58:18 +0000 (13:58 +0000)]
Fix VMRuntime.registerAppInfo usage
Partial cherry pick from git commit
d479b52d12fc782f18df6b5ae15c19e022f0ec14
Change-Id: I1de6e7eda23e6029c87896d8c01e063b98e39f74
Przemyslaw Szczepaniak [Tue, 1 Mar 2016 15:54:59 +0000 (15:54 +0000)]
Przemyslaw Szczepaniak [Mon, 29 Feb 2016 17:23:07 +0000 (17:23 +0000)]
Track libcore change
e42e99816ad6c0626564aaabcf636e8febc1edc6
Change-Id: I7b111ba383751de26c53fcdd8640115d7ddb3890
Neil Fuller [Mon, 29 Feb 2016 10:33:29 +0000 (10:33 +0000)]
Merge changes from topic 'java_8_layoutlib'
* changes:
Switch LayoutLib to Java 8
Move LayoutLib to Java 8
Nicolas Geoffray [Fri, 26 Feb 2016 14:45:02 +0000 (14:45 +0000)]
Merge "Fix ASAN builds after app_process change."
Nicolas Geoffray [Fri, 26 Feb 2016 13:16:50 +0000 (13:16 +0000)]
Fix ASAN builds after app_process change.
Bug:
27245894
(cherry picked from commit
573895bbea7cf349d615606004cdb85ba2ca814d)
Change-Id: I1b879f23cd2bb49070cbfee40ae1b8a586a328dc
Nicolas Geoffray [Fri, 26 Feb 2016 13:33:51 +0000 (13:33 +0000)]
Merge "zygote to preload public native libraries"
Dimitry Ivanov [Mon, 22 Feb 2016 19:22:11 +0000 (11:22 -0800)]
zygote to preload public native libraries
Preload public native libraries when starting a zygote
This lets other users of libnativeloader (like dex2oat)
avoid unnecessary cold loads of libandroid.so which could
take up to a second.
Bug: http://b/
27245894
(cherry picked from commit
b0824979be2653ba300382b52c1b1236fd44f0de)
Change-Id: I04a640c104dba5b585a59d63270e81b6c9ad6f7e
Dimitry Ivanov [Thu, 25 Feb 2016 19:35:55 +0000 (19:35 +0000)]
Merge "Construct classloader for apps with no java code"
Zhijun He [Wed, 24 Feb 2016 01:46:12 +0000 (01:46 +0000)]
Merge "ImageReader: override the flexible YUV compatible formats"
Dimitry Ivanov [Fri, 19 Feb 2016 22:09:20 +0000 (14:09 -0800)]
Construct classloader for apps with no java code
The commit
6f06ad7df1362e9e5b252689f452bdeee2e5af46
fixed a way to load native library for NativeActivity
by using classloader logic to find the library; which
also fixed the problem of native activity not working
when library is supposed to be opened directly from
the apk.
As a side effect it introduced regression - apps without
java code did not have correctly initialized classloader.
This change fixes this by constructing classloader with
empty dexpath but valid nativeLibrarySearchPath.
Bug: http://b/
26015561
Bug: http://b/
27250344
Change-Id: I50f1119f0976a95edd75d88efb9fcdedc57efbc3
(cherry picked from commit
b9c9026bdd0076014aeca62b088053d8fbce2326)
Pavlin Radoslavov [Tue, 23 Feb 2016 23:43:33 +0000 (23:43 +0000)]
Merge "Suppress output for Protobuf data if Bluetooth is disabled"
Pavlin Radoslavov [Tue, 23 Feb 2016 19:54:37 +0000 (11:54 -0800)]
Suppress output for Protobuf data if Bluetooth is disabled
If Bluetooth is disabled or there is some other error,
don't print anything when extracting the Metrics-related data
in Protobuf format.
Bug:
27315491
Change-Id: Ic1ec5334fbf0b524909400f080e2eac3ec34edf4
Wale Ogunwale [Tue, 23 Feb 2016 15:34:52 +0000 (15:34 +0000)]
Merge "Make accessing mWaitingForDrawn thread-safe"
Jason Monk [Tue, 23 Feb 2016 13:51:22 +0000 (13:51 +0000)]
Merge "Fix NPE in BaseStatusbar in onListenerConnected"
tiger_huang [Tue, 23 Feb 2016 12:34:52 +0000 (20:34 +0800)]
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
Neil Fuller [Tue, 23 Feb 2016 11:55:09 +0000 (11:55 +0000)]
Merge "Add stubs needed to enable javac to compile lambdas"
Neil Fuller [Thu, 18 Feb 2016 13:57:43 +0000 (13:57 +0000)]
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
Kent Persson [Wed, 10 Dec 2014 15:40:13 +0000 (16:40 +0100)]
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
Chien-Yu Chen [Tue, 23 Feb 2016 01:10:26 +0000 (01:10 +0000)]
Merge "Camera2: Fix getInternalFormatSizes for depth"
Chien-Yu Chen [Tue, 16 Feb 2016 22:28:50 +0000 (14:28 -0800)]
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
Andreas Gampe [Mon, 22 Feb 2016 18:00:49 +0000 (18:00 +0000)]
Merge "Preload2: Fix object to sync on"
Deepanshu Gupta [Thu, 18 Feb 2016 04:42:31 +0000 (20:42 -0800)]
Switch LayoutLib to Java 8
The main build hasn't swtiched to java 8, but lambdas are already used
in layoutlib. This fixes the build break.
(cherry picked from commit
7914e4ca03322427740d6f8c00837375dbf3031a)
Change-Id: Ice5741dcb8b93faf739a3c21f2ed8be95f92ad08
Deepanshu Gupta [Wed, 7 Oct 2015 00:56:37 +0000 (17:56 -0700)]
Move LayoutLib to Java 8
Partial cherry-pick of commit
491523d52cd8368ef9a92e95fb3e9332bf86a996
Change-Id: Ic64fb20a00ba2ca8b3016f548222729e3f009e9f
Narayan Kamath [Mon, 22 Feb 2016 11:45:55 +0000 (11:45 +0000)]
Narayan Kamath [Mon, 22 Feb 2016 11:42:07 +0000 (11:42 +0000)]
Track libcore commit
aff7af3b344bf882620489631633e09fabfcd58d.
bug:
27186457
Change-Id: I257eb422d6edcc1c52fc948995569fba6baf594f
Andreas Gampe [Fri, 19 Feb 2016 17:24:43 +0000 (09:24 -0800)]
Preload2: Fix object to sync on
When moving to sync on the right objects, these waits() have been
forgotten.
Change-Id: I61b0d3c5cc41b7f46fbdd3099ec44221e653001a
Neil Fuller [Fri, 19 Feb 2016 11:49:18 +0000 (11:49 +0000)]
Merge "Add flags needed to switch Jack to 1.8 for CTS targets"
Neil Fuller [Fri, 19 Feb 2016 11:46:19 +0000 (11:46 +0000)]
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
Neil Fuller [Fri, 19 Feb 2016 10:28:29 +0000 (10:28 +0000)]
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
Colin Cross [Fri, 19 Feb 2016 06:10:36 +0000 (06:10 +0000)]
Merge "Add dumpsys meminfo --unreachable"
Neil Fuller [Mon, 15 Feb 2016 12:05:44 +0000 (12:05 +0000)]
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
Neil Fuller [Fri, 12 Feb 2016 15:38:34 +0000 (15:38 +0000)]
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
Neil Fuller [Thu, 18 Feb 2016 13:32:30 +0000 (13:32 +0000)]
Merge "Add java.util.function APIs"
Neil Fuller [Tue, 19 Jan 2016 00:43:38 +0000 (16:43 -0800)]
Add java.util.function APIs
Bug:
26814204
(cherry-picked from commit
311a97e7f41c494bc355f5d77adc276e2a400970)
Change-Id: Id00ac095e45dbdc63e9542f4f3a20c2179c3ab72
Zhijun He [Thu, 18 Feb 2016 01:24:04 +0000 (17:24 -0800)]
ImageReader: override the flexible YUV compatible formats
For gralloc HAL v0.1 devices, if the producer buffer format is NV21 or YV12,
the returned flexFormat will be NV21 or YV12, which causes CTS failure
for ImageReader decoder test. This change overrides the NV21 or YV12 image
formats to HAL_PIXEL_FORMAT_YCbCr_420_888 for such case. With this, the
ImageReader will work for the devices with older gralloc HAL implementations
for HAL_PIXEL_FORMAT_YCbCr_420_888 compatible formats.
Bug:
27136665
Change-Id: Ib4722f1f8dc20ad6561088755e4ab9d2e68f1b47
Michael Wright [Wed, 17 Feb 2016 22:37:21 +0000 (22:37 +0000)]
Merge "Add keylayout for Xbox One controller"
Miao Wang [Wed, 17 Feb 2016 18:50:54 +0000 (18:50 +0000)]
Merge "[RenderScript] Fix potential leak in RS JNI"
Tim Clark [Tue, 5 Jan 2016 16:25:46 +0000 (09:25 -0700)]
Add keylayout for Xbox One controller
Change-Id: Ifb4005ed7b6345c9af126d8f1bd22c7e2921871f
Yohann Roussel [Wed, 17 Feb 2016 15:15:57 +0000 (15:15 +0000)]
Merge "Suppress warnings of MultiDexLegacyAndException"
Yohann Roussel [Wed, 17 Feb 2016 11:14:33 +0000 (12:14 +0100)]
Suppress warnings of MultiDexLegacyAndException
To clean build logs without disturbing the test.
Bug:
27155813
Change-Id: If80d7ad044dc9b4dfde5ded332e9ba566e536054
Sami Tolvanen [Tue, 16 Feb 2016 21:52:13 +0000 (21:52 +0000)]
Merge "Support persist.sys.audit_safemode"
Andreas Gampe [Tue, 16 Feb 2016 20:41:30 +0000 (20:41 +0000)]
Merge "Frameworks/base: Fix registration function"
Andreas Gampe [Tue, 16 Feb 2016 18:09:31 +0000 (10:09 -0800)]
Frameworks/base: Fix registration function
Registration functions return "int."
(cherry picked from commit
faa1033dc7d6b1ea6c17a483e586eaa167d154f9)
Change-Id: Icb8d35f3bc23794cdb22db1c1adda236c9d8676e
Dimitry Ivanov [Sat, 13 Feb 2016 01:03:41 +0000 (01:03 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 13 Feb 2016 00:44:33 +0000 (16:44 -0800)]
Add missing liblog dependency
Bug: http://b/
27171986
Change-Id: I40b93ac0d4bfacfc38c08b5dbc5d2b3358a976cb
Amith Yamasani [Fri, 12 Feb 2016 18:35:11 +0000 (18:35 +0000)]
Merge "When the device boots up, netd works more than required"
Amith Yamasani [Fri, 12 Feb 2016 17:50:17 +0000 (17:50 +0000)]
Merge "onAccountsUpdated shouldn't be called back after listener unregistered"
Miao Wang [Thu, 11 Feb 2016 20:32:39 +0000 (12:32 -0800)]
[RenderScript] Fix potential leak in RS JNI
Bug:
27145639
Change-Id: I80cf2971d803a3366a63caa3612a503a88639040
Przemyslaw Szczepaniak [Thu, 11 Feb 2016 13:27:46 +0000 (13:27 +0000)]
Merge "Hide java.security.Signatue#getCurrentSpi"
Przemyslaw Szczepaniak [Thu, 11 Feb 2016 11:56:21 +0000 (11:56 +0000)]
Hide java.security.Signatue#getCurrentSpi
Internal implementation detail, shouldn't
be public.
Bug:
26689841
Change-Id: Ie0b7f9fc2659cb21f58f59c17df52c83e025a87c
Przemyslaw Szczepaniak [Thu, 11 Feb 2016 10:06:55 +0000 (10:06 +0000)]
Merge "Remove java.nio.channels.* classes without test coverage."
Przemyslaw Szczepaniak [Wed, 10 Feb 2016 15:16:39 +0000 (15:16 +0000)]
Remove java.nio.channels.* classes without test coverage.
Removed classes come from openJdk 1.7 and were never
implemented before. We lack a testing suite to verify that
they are working correctly. Those clasess might by
re-added in further releases
Bug:
27117463
Change-Id: Ia7554a9182507b9fa1c1b6db9573ab68cb641f36
Brian Carlstrom [Wed, 10 Feb 2016 03:29:28 +0000 (03:29 +0000)]
Merge "Java 8 in layoutlib-create"
Deepanshu Gupta [Thu, 7 Jan 2016 23:54:27 +0000 (15:54 -0800)]
Java 8 in layoutlib-create
Upgrade to ASM 5 and diamond operators.
Also minor fixes here and there.
Bug:
26442940
(cherry picked from commit
23e47f5621271db9b84f53f15a3e3d81d8b8b48d)
Change-Id: I770d80626ef7a7b8cba82ce2c5fbc54c8874bc6b
Elliott Hughes [Wed, 10 Feb 2016 01:17:33 +0000 (01:17 +0000)]
Merge "The NDK samples moved a while back."
Elliott Hughes [Wed, 10 Feb 2016 00:12:02 +0000 (16:12 -0800)]
The NDK samples moved a while back.
Change-Id: I10f419b0ad58f9c5417a3f06775e298c74f284dc
Sami Tolvanen [Fri, 5 Feb 2016 22:30:45 +0000 (14:30 -0800)]
Support persist.sys.audit_safemode
Don't leave safe more if persist.sys.audit_safemode is set, unless the
current build date is newer than the specified value.
This allows us to keep the device in safe mode across reboots until an
OTA has been applied or user data is wiped.
Bug:
26902605
Change-Id: I781c3059ea8d4fb2f0c923e4488b1932d69678d3
Przemyslaw Szczepaniak [Tue, 9 Feb 2016 17:07:10 +0000 (17:07 +0000)]
Merge "Remove public InetAddress#getAddressInternal()"
Przemyslaw Szczepaniak [Tue, 9 Feb 2016 17:05:48 +0000 (17:05 +0000)]
Merge "SocketImpl#getFileDescriptor shouldn't be public"
Paul Duffin [Tue, 9 Feb 2016 16:51:09 +0000 (16:51 +0000)]
Merge "Replace usages of ShortNumberUtil with ShortNumberInfo"
Paul Duffin [Tue, 9 Feb 2016 16:40:53 +0000 (16:40 +0000)]
Replace usages of ShortNumberUtil with ShortNumberInfo
The ShortNumberInfo class appears to support the exact same
methods as the ShortNumberUtil class (at least in terms of the
methods used by this project) but is a singleton and so
instances cannot be created directly but instead must be
retrieved using the static getInstance() method.
The ShortNumberUtil class was deprecated in version 5.8 and
removed in 7.2.3 of libphonenumber. This change is required in
order to allow libphonenumber to be upgraded to 7.2.4.
Bug:
26975810
Change-Id: Ide40c65d12cb44453f84600fc4b5ad1ee1088470
Przemyslaw Szczepaniak [Mon, 8 Feb 2016 14:37:34 +0000 (14:37 +0000)]
Remove public InetAddress#getAddressInternal()
This method shouldn't be public + can be replaced by
the #getAddress method
Bug:
26689841
Change-Id: I1a15e4b2085049564b1de57dbfb200d157d5ebe5
Przemyslaw Szczepaniak [Mon, 8 Feb 2016 15:53:44 +0000 (15:53 +0000)]
SocketImpl#getFileDescriptor shouldn't be public
It's protected, as it was before openJdk switch. Added
hidden public method getFD$ for tests.
Bug:
26689841
Change-Id: If275e249d2b46ee6cf22a06d62374bbf47c55342
Colin Cross [Wed, 3 Feb 2016 00:51:15 +0000 (16:51 -0800)]
Add dumpsys meminfo --unreachable
dumpsys meminfo --unreachable will search the native heap for
allocations that are unreachable.
Change-Id: I40ab1c261cb222ca71d04ab8408f355bcb18ed94
John Reck [Fri, 5 Feb 2016 23:38:10 +0000 (23:38 +0000)]
Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
Alex Klyubin [Fri, 5 Feb 2016 22:26:56 +0000 (22:26 +0000)]
Merge "Fix typo in KeyInfo Javadoc."
Alex Klyubin [Fri, 5 Feb 2016 22:18:19 +0000 (14:18 -0800)]
Fix typo in KeyInfo Javadoc.
Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203
Igor Murashkin [Fri, 5 Feb 2016 17:53:04 +0000 (17:53 +0000)]
Merge "api: Un-hide new reflection 1.8 APIs"
Igor Murashkin [Fri, 5 Feb 2016 05:04:29 +0000 (21:04 -0800)]
api: Un-hide new reflection 1.8 APIs
(cherry-picked from commit
2b11b688b841a00afe5eda8bda02409172751318)
Change-Id: Ica3dba651f4a9239c39c4c90fb8478a5f6ff8b71
Martijn Coenen [Fri, 5 Feb 2016 09:38:16 +0000 (09:38 +0000)]
Merge "Improve NFC-F transceive() docs."
Martijn Coenen [Fri, 5 Feb 2016 09:24:49 +0000 (10:24 +0100)]
Improve NFC-F transceive() docs.
It wrongly said the SoD included the length;
put a sample frame in the docs to help devs.
Change-Id: I8ea74f37e7335f3e05f7df81fc303bf6195ac3cc
Amith Yamasani [Thu, 4 Feb 2016 21:52:54 +0000 (21:52 +0000)]
Merge "Transit to correct state after alarm is fired"
Koji Fukui [Wed, 16 Dec 2015 10:43:01 +0000 (19:43 +0900)]
Transit to correct state after alarm is fired
Symptom:
When AlarmClock fires in IDLE, state is changed to ACTIVE.
But the ACTIVE state continues under some conditions.
Root cause:
Transition from IDLE state to ACTIVE state when AlarmClock fires
1. Send ACTION_STEP_IDLE_STATE intent
2. Calles onReceive() in BroadcastReceiver
3. Calles stepIdleStateLocked()
4. Calles becomeActiveLocked()
Check point (1) to change from ACTIVE state to INACTIVE
(Display On -> Off)
1. onDisplayChanged()
2. updateDisplayLocked()
3. becomeInactiveIfAppropriateLocked()
Check point (2) to change from ACTIVE state to INACTIVE
(charging -> not charging)
1. ACTION_BATTERY_CHANGED
2. updateChargingLocked()
3. becomeInactiveIfAppropriateLocked()
There are only two check points to change from ACTIVE to INACTIVE.
If state transition, from IDLE to ACTIVE,
happened by AlarmClock when display is off and not charging,
ACTIVE state will be kept and never changes to INACTIVE state.
Change-Id: I93398366307f529b9c0074ac58b19ad6e4695790
Andre Eisenbach [Thu, 4 Feb 2016 00:25:34 +0000 (00:25 +0000)]
Merge "Implementation of BluetoothDevice.createBondOutOfBand"
Jakub Pawlowski [Tue, 29 Dec 2015 21:19:21 +0000 (13:19 -0800)]
Implementation of BluetoothDevice.createBondOutOfBand
This patch implements out of band pairing that uses optional data.
Currently, it works only for LE transport, using Temporary Key value.
In the future fields might be added to OOBData to support other options for
optional data.
Change-Id: I0811182efb72ac5f80521ed4876b32603cb628c1
Eric Laurent [Wed, 3 Feb 2016 17:30:39 +0000 (17:30 +0000)]
Merge "Bluetooth: Restrict gain for Absolute volume case"
Soi, Yoshinari [Tue, 22 Dec 2015 03:02:18 +0000 (12:02 +0900)]
When the device boots up, netd works more than required
When the device boots up, netd adds rules for applications
which do not have the NETWORK permission to iptables.
Therefore, optimize NetworkPolicyManagerService to not touch
uids that do not have the NETWORK permission.
This modification is similar to Google commit
88e98dfa5.
Change-Id: Ic8bb837143b9e349859210654248195d62b73d17
Liejun Tao [Wed, 20 Jan 2016 23:52:20 +0000 (17:52 -0600)]
Bluetooth: Restrict gain for Absolute volume case
For the lowest music volume steps 1 and 2, restrict the gain to 50% and
75%. This will avoid the lowest volume steps being too loud for some
accessories. For music volume 0, set phone gain to 0 as some
accessories won't mute on their end.
Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f
Signed-off-by: Liejun Tao <baibai@motorola.com>
Narayan Kamath [Tue, 2 Feb 2016 11:55:59 +0000 (11:55 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:40:12 +0000 (11:40 +0000)]
Track libcore change
fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
Change-Id: Ib0e5efc903fe522fb2bc314b9000a26e90a4ea57
Narayan Kamath [Tue, 2 Feb 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
Mykola Kondratenko [Mon, 18 Jan 2016 11:43:30 +0000 (12:43 +0100)]
Alarm: add missing closedir after opendir when searching for RTC
It is mandatory that closedir() is called to deallocate DIR structure
allocated by opendir().
Fix degrade introduced by Google commit
0eb58268.
Change-Id: Ia12154f7f822153b4fc8e6bfb8b2bae17bc45c1a
Zhang Dongsheng [Thu, 21 Jan 2016 07:12:18 +0000 (15:12 +0800)]
libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case
If eglSwapBuffers is called but the under surface was destroyed,
the EGL_BAD_NATIVE_WINDOW error may also be generated according
to the EGL spec 1.4.
This really shouldn't happen from the upper, but add the graceful
handling of this case also.
Change-Id: Ic0a599808b72f401d2a01c3dc40f9e6ea0e0a564
Signed-off-by: Zhang Dongsheng <dongsheng.zhang@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Narayan Kamath [Mon, 1 Feb 2016 11:31:22 +0000 (11:31 +0000)]
Merge "close file in PersistentDataBlockService jni"
Lianwei Wang [Thu, 14 Jan 2016 02:42:35 +0000 (18:42 -0800)]
close file in PersistentDataBlockService jni
The opened file should be closed.
Change-Id: I8a43b338c5c9eb0a5b1b5329eec767c6395bc7eb
Signed-off-by: Lianwei Wang <lianwei.wang@gmail.com>
Kenny Root [Mon, 1 Feb 2016 10:58:14 +0000 (10:58 +0000)]
Merge changes from topic 'sni'
* changes:
Track libcore change
Track libcore change
Kenny Root [Fri, 15 Jan 2016 23:10:02 +0000 (15:10 -0800)]
Track libcore change
This tracks libcore change I5972095a2b51da50249016fda11ed4c046af4211
which adds honor-cipher-suite-ordering API.
Change-Id: I7f17e42561c76b4c0a3f451d1126458480c90273
Kenny Root [Fri, 15 Jan 2016 23:10:02 +0000 (15:10 -0800)]
Track libcore change
This tracks libcore change I23b85308ac25fd00307d37cff1d93ee6c2bfba98
which adds SNI support.
Change-Id: I93d8a4b07cc1f599123565a5c0672dd7848f05bf
Stephen Hines [Sat, 30 Jan 2016 17:44:52 +0000 (17:44 +0000)]
Merge "Remove the CREATE_FLAG_OPT_LEVEL_0 from the Java API."
Neil Fuller [Fri, 29 Jan 2016 16:19:36 +0000 (16:19 +0000)]
Merge "Unhide @Repeatable"
Neil Fuller [Tue, 19 Jan 2016 00:34:04 +0000 (16:34 -0800)]
Unhide @Repeatable
Bug:
26623636
(cherry-picked from commit
c98d6a4c19ab9d5620c05b0f5ccb3b91a9eaba15)
Change-Id: I6378d5780def3a26d340f213973a4094e97426f5
Neil Fuller [Fri, 29 Jan 2016 16:10:13 +0000 (16:10 +0000)]
Merge "Unhide @FunctionalInterface"
Neil Fuller [Tue, 19 Jan 2016 00:20:56 +0000 (16:20 -0800)]
Unhide @FunctionalInterface
Bug:
26623636
(cherry-picked from commit
c5064327eae625b67013736048e35388decce52b)
Change-Id: I05fc731356891c4fdba79701b1b87384841d56ca
Neil Fuller [Fri, 29 Jan 2016 15:31:38 +0000 (15:31 +0000)]
Merge "Unhide Method.isDefault"
Neil Fuller [Sat, 23 Jan 2016 21:29:36 +0000 (13:29 -0800)]
Unhide Method.isDefault
Bug:
26623636
(cherry-picked from commit
20a4d572263cc288af4bd99849d1acc9e956ff06)
Change-Id: I5fd46b521d5098c72585b2acf06beaea4b9fa93f
Pavlin Radoslavov [Thu, 28 Jan 2016 00:52:41 +0000 (00:52 +0000)]
Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
Pavlin Radoslavov [Thu, 28 Jan 2016 00:22:15 +0000 (16:22 -0800)]
Grant CAP_WAKE_ALARM to the Bluetooth process for any user
Use multiuser_get_app_id(uid) to check for AID_BLUETOOTH
and allow the CAP_WAKE_ALARM capability for any user.
Bug:
26784675
Change-Id: I11641e212b7c815e9137ae5620da6ad55f95a899
Miao Wang [Wed, 27 Jan 2016 21:30:00 +0000 (21:30 +0000)]
Merge "[RenderScript] Implement APIs for better multi-frame process support."