OSDN Git Service
Tobias Thierer [Wed, 3 Aug 2016 09:54:23 +0000 (09:54 +0000)]
Merge "remove x attribute of java file"
Treehugger Robot [Wed, 3 Aug 2016 00:04:19 +0000 (00:04 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
Ganesh Mahendran [Tue, 28 Jun 2016 07:59:45 +0000 (15:59 +0800)]
remove x attribute of java file
java file do not need x attribute, so this patch
removes it.
Change-Id: I807722ac3f40688f032228294d61a4266d0e9e60
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
Dimitry Ivanov [Mon, 1 Aug 2016 21:12:38 +0000 (14:12 -0700)]
libsigchain: intercept bsd_signal on lp32
bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.
libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.
Bug: http://b/
30562229
Test: readelf --dyn-sym app_process32 and check that bsd_signal is exported
readelf --dyn-sym app_process64 and check that bsd_signal is not exported
Change-Id: Iec584070b42bc7fa43b114c0f884aff2db5a6858
Fyodor Kupolov [Mon, 1 Aug 2016 17:34:32 +0000 (17:34 +0000)]
Merge "Fix the API compatibility of "UriMatcher#addURI""
Hidehiko Tsuchiya [Tue, 25 Mar 2014 09:27:27 +0000 (18:27 +0900)]
Fix the API compatibility of "UriMatcher#addURI"
The previous patch (
ef23bf19 Allow leading slash in path...) made
a single slash path unmatchable.
To solve it, this patch stops removing a slash character if the path
only has a slash character.
Now, a single slash is a matchable path for a URI without path string.
Bug:
29524484
Change-Id: I90b357aa48be1a3e0cf36e75ed2a9d6532908972
John Stultz [Thu, 28 Jul 2016 19:35:31 +0000 (12:35 -0700)]
Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms
The when the timerfd alarm logic was added to the kernel, an oversight was made
and the interface does not check for the CAP_WAKE_ALARM permissions as required
via other kernel methods to trigger an alarm timer.
In v4.8-rc kernels, the change
2895a5e5b3a ("timerfd: Reject ALARM timerfds
without CAP_WAKE_ALARM") was added by Eric Caruso <ejcaruso@google.com>.
After this change (which may be backported to -stable), the AlarmManager will
fail on the first timerfd_create call, and will not be able to set the time
or handle other necessary functions.
The solution here is to add CAP_WAKE_ALARM to the system_server process.
Change-Id: Ifdb16f3ef42711e553f727165de3922d484b5be4
Signed-off-by: John Stultz <john.stultz@linaro.org>
Sergio Giro [Wed, 27 Jul 2016 11:30:55 +0000 (11:30 +0000)]
Merge "api: destroy() and isDestroyed() methods are now default in Destroyable"
Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Fix memory leak in MediaScannerConnection"
Jesse Hall [Mon, 25 Jul 2016 03:36:57 +0000 (03:36 +0000)]
Merge "bootanimation: Call eglReleaseThread in threadLoop"
Chih-hung Hsieh [Fri, 22 Jul 2016 00:55:18 +0000 (00:55 +0000)]
Merge "Fix google-explicit-constructor warnings in frameworks/base"
Chih-Hung Hsieh [Thu, 21 Jul 2016 18:23:06 +0000 (11:23 -0700)]
Fix google-explicit-constructor warnings in frameworks/base
* Add explicit keyword to conversion constructors.
* Add NOLINT to implicit conversion constructors.
Bug:
28341362
Test: build with clang-tidy
Change-Id: Ie4d37072ab57d1662d18db4de1c8577247f43337
David Gross [Thu, 21 Jul 2016 16:15:37 +0000 (16:15 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."
xiaoli.xb.zuo [Wed, 13 Jul 2016 05:37:58 +0000 (14:37 +0900)]
Fix memory leak in MediaScannerConnection
This patch adds releasing of MediaScannerConnection in ClientProxy
after disconnecting and releasing of ClientProxy and
IMediaScannerService in disconnection sequence in
MediaScannerConnection.
Bug:
30150344
Change-Id: I1e162e4c9a0b7a741ace20480bcf06f3151a93bf
David Gross [Wed, 20 Jul 2016 23:04:35 +0000 (16:04 -0700)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
to Android 2.3 (API level 9).
Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.
Miscellaneous minor editorial changes.
Bug:
27299393
Bug:
30000147
Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Remove dependency on android_alarm.h."
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warning triggered in Clang r271374"
Pirama Arumuga Nainar [Wed, 29 Jun 2016 05:09:50 +0000 (22:09 -0700)]
Disable warning triggered in Clang r271374
http://b/
28149048
http://b/
29823425
Disable -Wconstant-conversion that gets triggered in
native/imageproc/to_rgba.c.
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Change-Id: Ia8dbe49a1a8577599244642cbd2e3bb17ec1f83c
Christopher Ferris [Mon, 18 Jul 2016 23:58:52 +0000 (16:58 -0700)]
Remove dependency on android_alarm.h.
android_alarm.h no longer exists in upstream android kernels. Since it's
only used by the AlarmManagerService, copy in the parts of the file that
are needed into that one file.
Bug:
30072483
Change-Id: I5c994dfa2ad261da48a67e5c35dc4b6618b82aa1
Treehugger Robot [Tue, 19 Jul 2016 00:09:24 +0000 (00:09 +0000)]
Merge "Handle long process names correctly."
Dmitriy Filchenko [Mon, 18 Jul 2016 23:00:35 +0000 (16:00 -0700)]
Handle long process names correctly.
pthread_setname_np() expects 16 or fewer characters for the name argument. When the process name is longer, we should trim it.
Change-Id: I40be3a4212bdaab900c8eb30fa27aeeb7ed1b0d1
Treehugger Robot [Wed, 13 Jul 2016 19:50:52 +0000 (19:50 +0000)]
Merge "Remove calls to set_process_name."
Dmitriy Filchenko [Tue, 12 Jul 2016 22:40:54 +0000 (15:40 -0700)]
Remove calls to set_process_name.
BUG:
29824203
Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb
Treehugger Robot [Tue, 12 Jul 2016 13:08:20 +0000 (13:08 +0000)]
Merge "Fix unsafe concurrent access in LegacyTypeTracker"
Hugo Benichi [Tue, 21 Jun 2016 00:48:07 +0000 (09:48 +0900)]
Fix unsafe concurrent access in LegacyTypeTracker
This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().
Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.
This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).
This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.
Bug:
29030387
(cherry picked from commit
78caa25870391f676e1edbd448b5ff3e12a99a1e)
Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
Todd Kennedy [Mon, 11 Jul 2016 14:32:02 +0000 (14:32 +0000)]
Merge "Solve the infinite loop on clearExternalStorageDataSync"
Shubham Ajmera [Mon, 11 Jul 2016 10:08:40 +0000 (10:08 +0000)]
Sergio Giro [Fri, 8 Jul 2016 12:33:35 +0000 (13:33 +0100)]
api: destroy() and isDestroyed() methods are now default in Destroyable
Test: make droid docs and check-ojluni-files
Bug:
29631070
Change-Id: I93015997fbb18a45ba438f6bfc5c6564f053da64
Treehugger Robot [Thu, 7 Jul 2016 15:19:01 +0000 (15:19 +0000)]
Merge "Resolve deadlock between ActivityManagerService and PowerManagerService"
Shibin George [Tue, 5 Jul 2016 20:42:10 +0000 (02:12 +0530)]
Resolve deadlock between ActivityManagerService and PowerManagerService
ActivityManagerService lock and PowerManagerService.mLock can
be acquired in different threads in different orders.
registerReceiver() here tries to acquire ActivityManagerService
internally while holding mLock. A particular call from
WindowManagerService acquires these locks in reverse order.
This deadlock can be resolved by moving registerReceiver()
to another thread.
https://code.google.com/p/android/issues/detail?id=215254
Change-Id: I12cd610e61f212a3fb5e441f2c7a557c90afbda4
Signed-off-by: Shibin George <shibing@codeaurora.org>
Treehugger Robot [Wed, 6 Jul 2016 07:58:53 +0000 (07:58 +0000)]
Merge "MediaSession: Use mHandler for sending a pending intent"
Jae Seo [Wed, 6 Jul 2016 07:15:54 +0000 (07:15 +0000)]
Merge "Fix deadlock in MediaSessionService during getCurrentUser()"
Shibin George [Tue, 28 Jun 2016 10:26:50 +0000 (15:56 +0530)]
Fix deadlock in MediaSessionService during getCurrentUser()
SystemServiceMAnager.stopUser() acquires ActivityManagerService
lock first and then acquires MediaSessionService.mLock during
onStopUser(). MediaSessionService.onSwitchUser(), on the other
hand, acquires mLock first and ActivityManagerService lock next.
This is a potential deadlock situation which can be resolved by
moving getCurrentUser() out of synchronized block. This will
release mLock sooner and avoid the deadlock.
https://code.google.com/p/android/issues/detail?id=214469
Change-Id: Ieb4520d60af6ca38496ca933da0cd9ae096a9408
Signed-off-by: Shibin George <shibing@codeaurora.org>
Przemyslaw Szczepaniak [Tue, 5 Jul 2016 08:42:05 +0000 (08:42 +0000)]
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:26:37 +0000 (16:26 +0000)]
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 15:35:28 +0000 (16:35 +0100)]
Track libcore change
4eed609c71648c069d8e83ec7001da29044d416b
Bug:
27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781
Shubham Ajmera [Thu, 30 Jun 2016 12:44:38 +0000 (13:44 +0100)]
Track libcore change
dd5097d93d2f2c211fc79cde4d5f09db48e8808a
Change-Id: If8e4308d6c43eae7e2661bc083dea657969b9254
Tobias Thierer [Thu, 30 Jun 2016 12:35:03 +0000 (12:35 +0000)]
Merge "Changes for upgrade to OkHttp 2.7.5"
Tobias Thierer [Wed, 1 Jun 2016 19:51:45 +0000 (20:51 +0100)]
Changes for upgrade to OkHttp 2.7.5
- Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
- Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
brings us closer to 3+
Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b
Przemyslaw Szczepaniak [Wed, 29 Jun 2016 16:41:01 +0000 (17:41 +0100)]
Track libcore change
c49fd8d2b8449193fbb53750e7f6a22cacc2f968
Bug:
28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
Yi Kong [Fri, 24 Jun 2016 16:47:02 +0000 (16:47 +0000)]
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:16:20 +0000 (11:16 +0000)]
Przemyslaw Szczepaniak [Mon, 20 Jun 2016 16:49:43 +0000 (17:49 +0100)]
Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a
This change reverts previous fix for b/
27582395 and makes
AbstractStringBuffer an Appendable.
Bug:
28666126
Bug:
27582395
Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b
Treehugger Robot [Thu, 23 Jun 2016 00:13:44 +0000 (00:13 +0000)]
Merge "Fix deadlock b/w ActivityManagerService and MediaSessionService"
Yi Kong [Wed, 22 Jun 2016 13:17:55 +0000 (14:17 +0100)]
Track libcore change
fec24735b29faf2a81dbbc35a3a5f9630a597259
Bug:
29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
Marie Janssen [Tue, 21 Jun 2016 21:26:00 +0000 (21:26 +0000)]
Merge "Fix links to Bluetooth Guide"
Sanket Agarwal [Tue, 21 Jun 2016 20:37:36 +0000 (20:37 +0000)]
Merge "Bluetooth: Send GET request as single packet"
Shibin George [Tue, 14 Jun 2016 15:12:13 +0000 (20:42 +0530)]
Fix deadlock b/w ActivityManagerService and MediaSessionService
While handling adjustVolume and finishReceiver at the same time,
system_server gets into deadlock situation where
ActivityManagerService lock and MediaSessionService lock are
getting acquired in reverse order. To fix this,
adjustSuggestedStreamVolume() is shifted to MediaSessionService's
Handler thread.
https://code.google.com/p/android/issues/detail?id=213014
Change-Id: I3125c890546c8ab7c4df530bb68ba87cd688f8ce
Treehugger Robot [Mon, 20 Jun 2016 18:44:17 +0000 (18:44 +0000)]
Merge "DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages"
Marie Janssen [Mon, 20 Jun 2016 17:26:31 +0000 (10:26 -0700)]
Fix links to Bluetooth Guide
Change-Id: I5798c3d71c7cc9c509e0f7b04fa140168b0fdc11
John Reck [Thu, 16 Jun 2016 21:35:12 +0000 (21:35 +0000)]
Merge "Performance Optimization: Align texture dirty rect"
John Stultz [Thu, 16 Jun 2016 17:24:43 +0000 (10:24 -0700)]
DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages
My logcat is packed with these dispatcher vsync pulse messages
that really don't seem to be describing an error case (though
maybe I'm wrong?).
So quiet it down a bit and set the loglevel to verbose.
Change-Id: Ic4359f64f9cecfc1ffe49275f5f63327ba1b6f1d
Signed-off-by: John Stutlz <john.stultz@linaro.org>
Yi Kong [Thu, 16 Jun 2016 16:16:00 +0000 (16:16 +0000)]
Treehugger Robot [Thu, 16 Jun 2016 15:56:50 +0000 (15:56 +0000)]
Merge "Remove unused link to libcutils"
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]
Merge "API updated for ICU4J 57.1"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:07:31 +0000 (13:07 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Bug:
28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
Dan Willemsen [Wed, 15 Jun 2016 20:56:27 +0000 (13:56 -0700)]
Remove unused link to libcutils
This library is built against the NDK, so it shouldn't be linking to
platform libraries. It should also be pulling <android/log.h> from the
NDK headers, so remove the system/core/include include directory.
Change-Id: Ie9d6514f43492401697907aee4df56bdbf4e1926
AnubhavGupta [Mon, 21 Mar 2016 12:14:17 +0000 (17:44 +0530)]
Bluetooth: Send GET request as single packet
- If obex based profile explicitly sets GET with final flag, then
GET should always be sent as single packet request with final flag
set.
Change-Id: I82ff8295a239c4dbbfb4b3abfd358021820283cc
David Gross [Wed, 15 Jun 2016 18:44:03 +0000 (18:44 +0000)]
Merge "Delete simple reduction implementation."
ywen [Mon, 15 Feb 2016 08:09:40 +0000 (16:09 +0800)]
Performance Optimization: Align texture dirty rect
Align x offset and width to 32, y offset and height to 4.
It improves the font texture upload performance.
Change-Id: I967eeed90658f2ce1eb08cb2740d5dc34c72f40b
David Gross [Thu, 2 Jun 2016 21:46:55 +0000 (14:46 -0700)]
Delete simple reduction implementation.
Bug:
27298560
Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f
(cherry picked from commit
4a4578530a1a5fb751ea5a7bfbff83f3ab669895)
Fredrik Roubert [Mon, 13 Jun 2016 12:00:14 +0000 (14:00 +0200)]
API updated for ICU4J 57.1
Bug:
27819846
Change-Id: I891853397ac1f4de58fd0687e7cab27bd270ac64
Treehugger Robot [Thu, 9 Jun 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Unlock mBluetoothLock.readLock() instead of double-locking it"
Pavlin Radoslavov [Thu, 9 Jun 2016 19:58:07 +0000 (12:58 -0700)]
Unlock mBluetoothLock.readLock() instead of double-locking it
Bug:
29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
(cherry picked from commit
7ee53be300573c9bdc71607d32d4a642e4ad3dc8)
Tetsutoki Shiozawa [Wed, 8 Jun 2016 04:45:47 +0000 (13:45 +0900)]
Solve the infinite loop on clearExternalStorageDataSync
5000 msec timeout is set for waiting DefaultContainerService, but
it's not working. It's not possible to exit a wait loop even if it
takes over 5000 msec.
Bug:
29232999
Change-Id: I74a45637e0a3fa5a7b151e6b3dc0b3aaece96d53
Treehugger Robot [Tue, 7 Jun 2016 21:14:21 +0000 (21:14 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF"
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.
Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.
Bug:
17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
(cherry picked from commit
e47ec14318f64c29bf16b5a6bb662bc19206d6b0)
Eric Laurent [Tue, 7 Jun 2016 18:00:28 +0000 (18:00 +0000)]
Merge "Delete Visualizer before lpJniStorage"
ganxiaolin [Mon, 6 Jun 2016 03:09:05 +0000 (11:09 +0800)]
Delete Visualizer before lpJniStorage
It is related to Change: Id17bea8a6ca7132042b9bfefed398a715c139be7
Fix ANR because of bug of Visualizer.
If lpJniStorage was delete first, callback_data_lock become a invalid value.
At mReceiver.periodicCapture() in CaptureThread, it will lock callback_data_lock.
Thus, CaptureThread will wait a invalid memory forever and visualizer wait CaptureThread exiting and causing ANR.
Signed-off-by: ganxiaolin <ganxiaolin@xiaomi.com>
Treehugger Robot [Fri, 3 Jun 2016 21:28:33 +0000 (21:28 +0000)]
Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService."
Treehugger Robot [Fri, 3 Jun 2016 17:42:38 +0000 (17:42 +0000)]
Merge "While turning OFF do not honor ON requests."
Sanket Agarwal [Thu, 21 Apr 2016 21:10:55 +0000 (14:10 -0700)]
While turning OFF do not honor ON requests.
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.
This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.
Bug: b/
28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
songjinshi [Wed, 18 May 2016 11:55:32 +0000 (19:55 +0800)]
Fixes the system server crash issues caused by null pointer in
NetworkPolicyManagerService.
if the multi user occurs switch and remove then to getPackagesForUid
the return value will got null,because the user remove is not synced
with the getPackagesForUid,so we must check the return value for
getPackagesForUid to avoid the crash.
https://code.google.com/p/android/issues/detail?id=211972
Change-Id: If921582da86dbe862f2dad337b0a8d1f20593c99
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Shubham Ajmera [Thu, 2 Jun 2016 10:35:40 +0000 (10:35 +0000)]
Robert Greenwalt [Wed, 1 Jun 2016 18:15:15 +0000 (18:15 +0000)]
Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank."""
Vasco Brito [Wed, 1 Jun 2016 09:50:57 +0000 (10:50 +0100)]
Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""
This reverts commit
9a769a482861496686a4138a0a9b612a08fce8f8, reversing
changes made to
6fb921a61b0ca6bac8002e0fdbeb521453dce408.
Treehugger Robot [Tue, 31 May 2016 18:06:29 +0000 (18:06 +0000)]
Merge "Add 900 for Russia - Short code used by Sberbank."
Vasco Brito [Tue, 24 May 2016 18:23:20 +0000 (19:23 +0100)]
Add 900 for Russia - Short code used by Sberbank.
Sberbank SMS banking solution uses 900 short code.
They have requested this shortcode to be listed has premium to reduce banking fraud.
bug:
28423611
Change-Id: I82dfe012a1e55b2d025c24e50149fa01551a92ed
Signed-off-by: Vasco Brito <vascob@google.com>
Treehugger Robot [Sat, 28 May 2016 16:19:03 +0000 (16:19 +0000)]
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support""
Greg Hackmann [Sat, 28 May 2016 13:07:22 +0000 (13:07 +0000)]
Revert "AlarmManagerService: remove legacy /dev/alarm support"
This reverts commit
f68cdb9cb4841765d9d55d4a95259e9c3bb3ecc1.
Change-Id: I13e954656771f32c6156b4c4adb52922bcd0717a
Treehugger Robot [Fri, 27 May 2016 21:12:15 +0000 (21:12 +0000)]
Merge "AlarmManagerService: remove legacy /dev/alarm support"
Greg Hackmann [Mon, 25 Apr 2016 20:30:34 +0000 (13:30 -0700)]
AlarmManagerService: remove legacy /dev/alarm support
We've removed the Android alarm driver from our supported kernels. It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.
Bug:
28357356
Change-Id: I225d76c3f4e695a831d4419e050e8e178e1224b5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Chih-hung Hsieh [Fri, 27 May 2016 17:56:46 +0000 (17:56 +0000)]
Merge "Fix misc-macro-parentheses warnings in DngCreator."
Alan Viverette [Fri, 27 May 2016 14:18:20 +0000 (14:18 +0000)]
Merge "Chronometer: Update the value only if displayed on screen"
Sai Kiran Korwar [Tue, 16 Jun 2015 11:43:35 +0000 (17:13 +0530)]
bootanimation: Call eglReleaseThread in threadLoop
Add eglReleaseThread call in the threadLoop function to
ensure that the thread properly cleans up its resources
before exiting.
Change-Id: I90dff47370e7acaecc046c43f0bb274214a29f77
Miao Wang [Wed, 25 May 2016 22:28:34 +0000 (22:28 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation."
Miao Wang [Wed, 25 May 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Update documentation about copyTo and copyFrom."
Miao Wang [Wed, 13 Apr 2016 23:43:10 +0000 (16:43 -0700)]
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Bug:
28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
(cherry picked from commit
c242fa6b5d7b8624b5ce710c1e2740c5bb9679dd)
Miao Wang [Fri, 1 Apr 2016 22:10:47 +0000 (15:10 -0700)]
Update documentation about copyTo and copyFrom.
Bug:
23159764
Bug:
26862970
- Add detailed description of AutoPadding
- Add comments to all the copy related APIs.
- Fix typos in the comments.
Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9
(cherry picked from commit
3231e8e0220614f7b1628493da5f276f19faab7c)
Treehugger Robot [Wed, 25 May 2016 01:07:47 +0000 (01:07 +0000)]
Merge "Add missing "try ... finally" safeguards"
Pavlin Radoslavov [Tue, 24 May 2016 22:28:41 +0000 (15:28 -0700)]
Add missing "try ... finally" safeguards
Safeguards for code protected by ReentrantReadWriteLock.
Bug:
28734075
Bug:
28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
(cherry picked from commit
e957a8a0b4100d001f79c866e7904d2426ac8da0)
Treehugger Robot [Tue, 24 May 2016 23:17:36 +0000 (23:17 +0000)]
Merge "Reduced the impact of "synchronized" statements"
Pavlin Radoslavov [Mon, 23 May 2016 05:16:41 +0000 (22:16 -0700)]
Reduced the impact of "synchronized" statements
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
appropriate. The lock protects the access to and the setting of
BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
associated state.
Bug:
28734075
Bug:
28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
(cherry picked from commit
eb50a39e98acb78d16465041bb5c172aa1637e97)
Treehugger Robot [Tue, 24 May 2016 19:39:17 +0000 (19:39 +0000)]
Merge "Fix misc-macro-parentheses warnings in common_time."
Treehugger Robot [Tue, 24 May 2016 18:33:48 +0000 (18:33 +0000)]
Merge "Fix misc-macro-parentheses warnings in audio media jni."
Robert Greenwalt [Tue, 24 May 2016 15:57:09 +0000 (15:57 +0000)]
Merge "Add free short codes for Direct Carrier Billing."
Sergio Giro [Tue, 24 May 2016 11:56:50 +0000 (11:56 +0000)]
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"