git.osdn.net Git - android-x86/frameworks-base.git/log

Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
am: 1085be0ce3

Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f

commit | commitdiff | tree

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"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 1 Apr 2016 14:51:45 +0000 (07:51 -0700)]

GATT Server refactoring (2/4)

Bug: 27999121
Change-Id: Ia5f91298a4b01b62adebc8adc30f27f757259588

commit | commitdiff | tree

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>

commit | commitdiff | tree

Tobias Thierer [Tue, 2 Aug 2016 16:32:26 +0000 (17:32 +0100)]

Stop profiling on uncaught exception.

When "handling" an uncaught exception, make an attempt to stop
profiling. In case profiling was active, this will avoid losing
the profiling buffer.

This change is required as a base in order for
https://android-review.googlesource.com/#/c/249721/
to merge cleanly.

(Cherry picked from commit 4c79fea9efea7cfa739cf5b5f525ddadb28e52a6)
Bug: 26291225
Change-Id: I35f352e5f28eafe4702da9eae587c3b65c360b3a

commit | commitdiff | tree

songjinshi [Wed, 27 Jul 2016 12:36:46 +0000 (20:36 +0800)]

Fixes the system server crash issue caused by uncatched exception.

The restat method of the StatFs may throw an IllegalArgumentException,
so we must to catch it and throw an IOException for the caller
of the trimToFit(),this fix can improve system stability.

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

Change-Id: I54a2f569eea67d3ab628944e3586ca918ec70283
Signed-off-by: songjinshi <songjinshi@xiaomi.com>

commit | commitdiff | tree

Dan Willemsen [Mon, 1 Aug 2016 23:34:29 +0000 (23:34 +0000)]

Merge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp-master

commit | commitdiff | tree

Dimitry Ivanov [Mon, 1 Aug 2016 22:46:55 +0000 (22:46 +0000)]

Merge "libsigchain: intercept bsd_signal on lp32"
am: 6eb30f2060

Change-Id: Iee2b7a8db495dd76bb6468a03e6cffd29a998cdf

commit | commitdiff | tree

Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]

Merge "libsigchain: intercept bsd_signal on lp32"

commit | commitdiff | tree

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

commit | commitdiff | tree

Hidehiko Tsuchiya [Mon, 1 Aug 2016 17:43:30 +0000 (17:43 +0000)]

Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\"
am: 3e151273a3

Change-Id: Ic06ade3ce6dd795e7d12cfba150286933512433d

commit | commitdiff | tree

Fyodor Kupolov [Mon, 1 Aug 2016 17:34:32 +0000 (17:34 +0000)]

Merge "Fix the API compatibility of "UriMatcher#addURI""

commit | commitdiff | tree

Dan Willemsen [Mon, 1 Aug 2016 05:48:28 +0000 (22:48 -0700)]

Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite

Use the same name for the static and shared libraries so that the module
definitions can be shared.

Change-Id: I1578ee7044689194ae1baea4d71f1b0e8737505f

commit | commitdiff | tree

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

commit | commitdiff | tree

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>

commit | commitdiff | tree

Sergio Giro [Tue, 26 Jul 2016 19:05:22 +0000 (20:05 +0100)]

api: destroy() and isDestroyed() methods are now default in Destroyable

Change-Id: Ia5afcec8b627794bba7c69ca6245330b60aef5e9
Test: make droid docs and check-ojluni-files
Bug: 29631070

commit | commitdiff | tree

Sergio Giro [Wed, 27 Jul 2016 11:39:10 +0000 (11:39 +0000)]

Merge \"api: destroy() and isDestroyed() methods are now default in Destroyable\"
am: 877d6e75e6

Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b

commit | commitdiff | tree

Sergio Giro [Wed, 27 Jul 2016 11:30:55 +0000 (11:30 +0000)]

Merge "api: destroy() and isDestroyed() methods are now default in Destroyable"

commit | commitdiff | tree

xiaoli.xb.zuo [Tue, 26 Jul 2016 15:43:55 +0000 (15:43 +0000)]

Merge \"Fix memory leak in MediaScannerConnection\"
am: e40ab18590

Change-Id: I894584a5d193624acc78c20a6207b54b20b61563

commit | commitdiff | tree

Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]

Merge "Fix memory leak in MediaScannerConnection"

commit | commitdiff | tree

Sai Kiran Korwar [Mon, 25 Jul 2016 03:46:44 +0000 (03:46 +0000)]

Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am: 189bbd9f6d

Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189

commit | commitdiff | tree

Jesse Hall [Mon, 25 Jul 2016 03:36:57 +0000 (03:36 +0000)]

Merge "bootanimation: Call eglReleaseThread in threadLoop"

commit | commitdiff | tree

Chih-Hung Hsieh [Fri, 22 Jul 2016 01:13:31 +0000 (18:13 -0700)]

resolve merge conflicts of 5152fd9 to stage-aosp-master

Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3

commit | commitdiff | tree

Chih-hung Hsieh [Fri, 22 Jul 2016 00:55:18 +0000 (00:55 +0000)]

Merge "Fix google-explicit-constructor warnings in frameworks/base"

commit | commitdiff | tree

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

commit | commitdiff | tree

David Gross [Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)]

resolve merge conflicts of ed6625d to stage-aosp-master

Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8

commit | commitdiff | tree

David Gross [Thu, 21 Jul 2016 16:15:37 +0000 (16:15 +0000)]

Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Christopher Ferris [Wed, 20 Jul 2016 18:10:47 +0000 (18:10 +0000)]

Merge \"Remove dependency on android_alarm.h.\"
am: c95e7a3014

Change-Id: I19908fa29772c89b8112e371702da6197b20465d

commit | commitdiff | tree

Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]

Merge "Remove dependency on android_alarm.h."

commit | commitdiff | tree

Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:41:20 +0000 (23:41 +0000)]

Merge \"Disable warning triggered in Clang r271374\"
am: bba87840d3

Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338

commit | commitdiff | tree

Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]

Merge "Disable warning triggered in Clang r271374"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dmitriy Filchenko [Tue, 19 Jul 2016 00:19:15 +0000 (00:19 +0000)]

Merge \"Handle long process names correctly.\"
am: e2994438d2

Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358

commit | commitdiff | tree

Treehugger Robot [Tue, 19 Jul 2016 00:09:24 +0000 (00:09 +0000)]

Merge "Handle long process names correctly."

commit | commitdiff | tree

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

commit | commitdiff | tree

Dmitriy Filchenko [Wed, 13 Jul 2016 19:57:52 +0000 (19:57 +0000)]

Merge \"Remove calls to set_process_name.\"
am: 8ee58b3b4e

Change-Id: Ia0157f7b7fa1b048ca98b55f5525089046e6cccd

commit | commitdiff | tree

Treehugger Robot [Wed, 13 Jul 2016 19:50:52 +0000 (19:50 +0000)]

Merge "Remove calls to set_process_name."

commit | commitdiff | tree

Dmitriy Filchenko [Tue, 12 Jul 2016 22:40:54 +0000 (15:40 -0700)]

Remove calls to set_process_name.

BUG:29824203

Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb

commit | commitdiff | tree

Hugo Benichi [Tue, 12 Jul 2016 13:15:41 +0000 (13:15 +0000)]

Merge \"Fix unsafe concurrent access in LegacyTypeTracker\"
am: ee4c8fb9eb

Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06

commit | commitdiff | tree

Treehugger Robot [Tue, 12 Jul 2016 13:08:20 +0000 (13:08 +0000)]

Merge "Fix unsafe concurrent access in LegacyTypeTracker"

commit | commitdiff | tree

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

commit | commitdiff | tree

Tetsutoki Shiozawa [Mon, 11 Jul 2016 14:42:57 +0000 (14:42 +0000)]

Merge \"Solve the infinite loop on clearExternalStorageDataSync\"
am: 9a3fbe1162

Change-Id: I5cfb3374a162863adc305f041eaca08d6efa2d3e

commit | commitdiff | tree

Todd Kennedy [Mon, 11 Jul 2016 14:32:02 +0000 (14:32 +0000)]

Merge "Solve the infinite loop on clearExternalStorageDataSync"

commit | commitdiff | tree

Shubham Ajmera [Mon, 11 Jul 2016 10:16:34 +0000 (10:16 +0000)]

Merge \"Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a\"
am: 18941cb53f

Change-Id: I40ce35ca5e8901f3e8b1e06258c7a5649084d51e

commit | commitdiff | tree

Shubham Ajmera [Mon, 11 Jul 2016 10:08:40 +0000 (10:08 +0000)]

Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a"

commit | commitdiff | tree

Shubham Ajmera [Mon, 11 Jul 2016 09:59:12 +0000 (10:59 +0100)]

Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a

(cherry-picked from commit 30cbe3b264c23fd2dcf3a7bb8bb926a46578b35c)

Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09

commit | commitdiff | tree

Mark Salyzyn [Thu, 7 Jul 2016 18:30:32 +0000 (11:30 -0700)]

Settings: add logpersist kernel only selection (strings)

Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503

commit | commitdiff | tree

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

commit | commitdiff | tree

Shibin George [Thu, 7 Jul 2016 15:31:16 +0000 (15:31 +0000)]

Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\"
am: 06561db207

Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4

commit | commitdiff | tree

Treehugger Robot [Thu, 7 Jul 2016 15:19:01 +0000 (15:19 +0000)]

Merge "Resolve deadlock between ActivityManagerService and PowerManagerService"

commit | commitdiff | tree

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>

commit | commitdiff | tree

riddle_hsu [Wed, 6 Jul 2016 08:10:06 +0000 (08:10 +0000)]

Merge \"MediaSession: Use mHandler for sending a pending intent\"
am: fcae61308c

Change-Id: I60ab3a4a19426b7912658dfa6b7ebd20863adf72

commit | commitdiff | tree

Treehugger Robot [Wed, 6 Jul 2016 07:58:53 +0000 (07:58 +0000)]

Merge "MediaSession: Use mHandler for sending a pending intent"

commit | commitdiff | tree

Jae Seo [Wed, 6 Jul 2016 07:45:15 +0000 (00:45 -0700)]

resolve merge conflicts of 5b6c034 to stage-aosp-master

Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe

commit | commitdiff | tree

Jae Seo [Wed, 6 Jul 2016 07:15:54 +0000 (07:15 +0000)]

Merge "Fix deadlock in MediaSessionService during getCurrentUser()"

commit | commitdiff | tree

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>

commit | commitdiff | tree

Przemyslaw Szczepaniak [Tue, 5 Jul 2016 08:40:27 +0000 (09:40 +0100)]

Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968

Version with test-current.txt

Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab

commit | commitdiff | tree

Przemyslaw Szczepaniak [Tue, 5 Jul 2016 08:54:24 +0000 (08:54 +0000)]

Merge \"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\"
am: 326e55a3e2

Change-Id: I404c9665d23664f137462c246ebc724128035555

commit | commitdiff | tree

Przemyslaw Szczepaniak [Tue, 5 Jul 2016 08:42:05 +0000 (08:42 +0000)]

Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968"

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:33:53 +0000 (16:33 +0000)]

Merge \"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\"
am: cf5b00e6bc

Change-Id: Ib9462093cf0a6794950d3260b53754cb4c15389e

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:26:37 +0000 (16:26 +0000)]

Merge "Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b"

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 4 Jul 2016 15:35:28 +0000 (16:35 +0100)]

Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b

Bug: 27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781

commit | commitdiff | tree

TreeHugger Robot [Fri, 1 Jul 2016 04:54:44 +0000 (04:54 +0000)]