Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,782 Commits 3 Branches 0 Tags
4643acaa34f2d7bddaf86c9dbe21bce0fc5aec21
Commit Graph

251782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pirama Arumuga Nainar
4643acaa34 Merge \"Disable warning triggered in Clang r271374\" 
am: bba87840d3

Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
 2016-07-19 23:41:20 +00:00
Stephen Hines
bba87840d3 Merge "Disable warning triggered in Clang r271374" 2016-07-19 22:02:31 +00:00
Pirama Arumuga Nainar
b6709700db 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
 2016-07-19 20:31:39 +00:00
Dmitriy Filchenko
d5a72fae4a Merge \"Handle long process names correctly.\" 
am: e2994438d2

Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358
 2016-07-19 00:19:15 +00:00
Treehugger Robot
e2994438d2 Merge "Handle long process names correctly." 2016-07-19 00:09:24 +00:00
Dmitriy Filchenko
f5b6e5590e 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
 2016-07-18 16:03:05 -07:00
Dmitriy Filchenko
c1a1487057 Merge \"Remove calls to set_process_name.\" 
am: 8ee58b3b4e

Change-Id: Ia0157f7b7fa1b048ca98b55f5525089046e6cccd
 2016-07-13 19:57:52 +00:00
Treehugger Robot
8ee58b3b4e Merge "Remove calls to set_process_name." 2016-07-13 19:50:52 +00:00
Dmitriy Filchenko
342c7dcd02 Remove calls to set_process_name. 
BUG:29824203

Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb
 2016-07-12 15:44:55 -07:00
Hugo Benichi
e82b43f77e Merge \"Fix unsafe concurrent access in LegacyTypeTracker\" 
am: ee4c8fb9eb

Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06
 2016-07-12 13:15:41 +00:00
Treehugger Robot
ee4c8fb9eb Merge "Fix unsafe concurrent access in LegacyTypeTracker" 2016-07-12 13:08:21 +00:00
Hugo Benichi
5224f00b51 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 78caa25870)

Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
 2016-07-12 21:56:40 +09:00
Tetsutoki Shiozawa
2747eb7e94 Merge \"Solve the infinite loop on clearExternalStorageDataSync\" 
am: 9a3fbe1162

Change-Id: I5cfb3374a162863adc305f041eaca08d6efa2d3e
 2016-07-11 14:42:57 +00:00
Todd Kennedy
9a3fbe1162 Merge "Solve the infinite loop on clearExternalStorageDataSync" 2016-07-11 14:32:02 +00:00
Shubham Ajmera
fbe280e345 Merge \"Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a\" 
am: 18941cb53f

Change-Id: I40ce35ca5e8901f3e8b1e06258c7a5649084d51e
 2016-07-11 10:16:34 +00:00
Shubham Ajmera
18941cb53f Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a" 2016-07-11 10:08:40 +00:00
Shubham Ajmera
a0d7917c36 Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a 
(cherry-picked from commit 30cbe3b264)

Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09
 2016-07-11 10:06:11 +00:00
Mark Salyzyn
1e6dab2b91 Settings: add logpersist kernel only selection (strings) 
Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
 2016-07-08 14:31:22 -07:00
Shibin George
2c565826ba Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\" 
am: 06561db207

Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4
 2016-07-07 15:31:16 +00:00
Treehugger Robot
06561db207 Merge "Resolve deadlock between ActivityManagerService and PowerManagerService" 2016-07-07 15:19:01 +00:00
Shibin George
43f5de0125 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>
 2016-07-07 19:45:35 +05:30
riddle_hsu
b417585b29 Merge \"MediaSession: Use mHandler for sending a pending intent\" 
am: fcae61308c

Change-Id: I60ab3a4a19426b7912658dfa6b7ebd20863adf72
 2016-07-06 08:10:06 +00:00
Treehugger Robot
fcae61308c Merge "MediaSession: Use mHandler for sending a pending intent" 2016-07-06 07:58:53 +00:00
Jae Seo
5f5bd8848c resolve merge conflicts of 5b6c034 to stage-aosp-master 
Change-Id: I664240e9a9b2693f912b5b2a8a1731d08f109bfe
 2016-07-06 00:45:15 -07:00
Jae Seo
5b6c03415c Merge "Fix deadlock in MediaSessionService during getCurrentUser()" 2016-07-06 07:15:54 +00:00
Shibin George
c4f28a4196 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>
 2016-07-06 05:00:43 +00:00
Przemyslaw Szczepaniak
9ede567f7c Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 
Version with test-current.txt

Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
 2016-07-05 08:59:10 +00:00
Przemyslaw Szczepaniak
ce482360b9 Merge \"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\" 
am: 326e55a3e2

Change-Id: I404c9665d23664f137462c246ebc724128035555
 2016-07-05 08:54:24 +00:00
Przemyslaw Szczepaniak
326e55a3e2 Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968" 2016-07-05 08:42:05 +00:00
Przemyslaw Szczepaniak
43714397df Merge \"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\" 
am: cf5b00e6bc

Change-Id: Ib9462093cf0a6794950d3260b53754cb4c15389e
 2016-07-04 16:33:53 +00:00
Przemyslaw Szczepaniak
cf5b00e6bc Merge "Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b" 2016-07-04 16:26:38 +00:00
Przemyslaw Szczepaniak
bab82f1df8 Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b 
Bug: 27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781
 2016-07-04 16:35:28 +01:00
TreeHugger Robot
7061535ce6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:54:45 +00:00
TreeHugger Robot
5b5853fd3f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:54:28 +00:00
TreeHugger Robot
8cdc731029 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:54:12 +00:00
TreeHugger Robot
aac5c0e427 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:56 +00:00
TreeHugger Robot
79c9b301ee Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:41 +00:00
TreeHugger Robot
2250c7ccaa Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:36 +00:00
TreeHugger Robot
f20ff3a07e Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:21 +00:00
TreeHugger Robot
e3f8e76f78 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:53:05 +00:00
TreeHugger Robot
873e9e16ab Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:50 +00:00
TreeHugger Robot
da696a6d9c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:35 +00:00
TreeHugger Robot
689366fe33 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:20 +00:00
TreeHugger Robot
9d3c51d66f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:52:05 +00:00
TreeHugger Robot
baedc65a8b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:51:50 +00:00
TreeHugger Robot
914376787b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-07-01 04:49:41 +00:00
Bill Yi
9a2f574fce Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iac4bc0fff7337c0971222e59b1f01e4a7ff3a1c5
 2016-06-30 19:59:37 -07:00
Bill Yi
a1036aed71 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I75df6be0cf865770568238976172e093082dca3d
 2016-06-30 19:53:56 -07:00
Bill Yi
0789113f7f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ie154b48d77d2bc34ae1e71e1c3813c3ed2959eeb
 2016-06-30 18:41:48 -07:00
Bill Yi
008744326d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia84a48847f77b72112f827ed67332fb1e293eea8
 2016-06-30 18:39:36 -07:00