OSDN Git Service
Chih-hung Hsieh [Fri, 21 Nov 2014 18:54:15 +0000 (18:54 +0000)]
Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
Should be unnecessary after c/115476.
This reverts commit
ba823cee8bafff98640408a777fe105a72fcea0d.
Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
Andreas Gampe [Tue, 11 Nov 2014 05:01:06 +0000 (21:01 -0800)]
Frameworks/base: Mask Skia warning in GraphicsJNI
Do not allow unused-parameter warnings from Skia includes.
Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
Andreas Gampe [Tue, 11 Nov 2014 02:38:03 +0000 (02:38 +0000)]
Merge "Frameworks/base: Wall Werror in libs/input"
Andreas Gampe [Tue, 11 Nov 2014 02:37:46 +0000 (02:37 +0000)]
Merge "Frameworks/base: Wall Werror in libs/hwui"
Andreas Gampe [Tue, 11 Nov 2014 02:30:00 +0000 (02:30 +0000)]
Merge "Frameworks/base: Wall Werror in media/jni"
Andreas Gampe [Tue, 11 Nov 2014 02:19:40 +0000 (18:19 -0800)]
Frameworks/base: Wall Werror in media/jni
Turn on -Wall -Werror in media/jni. Fix warnings.
Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
Andreas Gampe [Tue, 11 Nov 2014 02:07:27 +0000 (02:07 +0000)]
Merge "Frameworks/base: Wall Werror in media/mca"
Andreas Gampe [Tue, 11 Nov 2014 01:56:11 +0000 (01:56 +0000)]
Merge "Frameworks/base: Wall Werror in native/graphics"
Andreas Gampe [Tue, 11 Nov 2014 01:53:35 +0000 (01:53 +0000)]
Merge "Frameworks/base: Wall Werror in drm"
Andreas Gampe [Tue, 11 Nov 2014 01:51:29 +0000 (01:51 +0000)]
Merge "Frameworks/base: Wall Werror in native/android"
Andreas Gampe [Tue, 11 Nov 2014 01:49:02 +0000 (17:49 -0800)]
Frameworks/base: Wall Werror in media/mca
Turn on -Wall -Werror in media/mca. Fix warnings.
Change-Id: I2a43df1d0639babe240b91942a5ea3f8babdef93
Andreas Gampe [Tue, 11 Nov 2014 01:23:02 +0000 (17:23 -0800)]
Frameworks/base: Wall Werror in drm
Turn on -Wall -Werror in drm/jni. Fix warnings.
Change-Id: If24fec45fbb737af593ddadfa473548dfa583e0b
Andreas Gampe [Tue, 11 Nov 2014 01:13:06 +0000 (17:13 -0800)]
Frameworks/base: Wall Werror in native/graphics
Turn on -Wall -Werror in native/graphics. Mask skia warnings.
Change-Id: Ia671e91348296ace84d9a24b3c6c025fa889bead
Yabin Cui [Tue, 11 Nov 2014 01:09:31 +0000 (01:09 +0000)]
Merge "kill OS_CASE_SENSITIVE"
Andreas Gampe [Tue, 11 Nov 2014 00:48:26 +0000 (16:48 -0800)]
Frameworks/base: Wall Werror in native/android
Turn on -Wall -Werror in native/android.
Change-Id: I28bab9ebd2fe3f6935878816773a04531e26450f
Yabin Cui [Tue, 11 Nov 2014 00:10:12 +0000 (00:10 +0000)]
Merge "kill HAVE_INOTIFY"
Yabin Cui [Mon, 10 Nov 2014 23:01:43 +0000 (15:01 -0800)]
kill OS_CASE_SENSITIVE
Bug:
18314594
Change-Id: Ib11b45d2597b2576bc7df2d0167ce1bbd1449523
Yabin Cui [Mon, 10 Nov 2014 23:43:18 +0000 (15:43 -0800)]
kill HAVE_INOTIFY
Bug:
18314841
Change-Id: I880a35bf51a1aecba2f111e7f6eae54c7d17a28d
Andreas Gampe [Mon, 10 Nov 2014 23:23:43 +0000 (15:23 -0800)]
Frameworks/base: Wall Werror in libs/hwui
Turn on -Wall -Werror in libs/hwui. Fix errors.
Change-Id: I74962d08c889712dacbd0d86d6760fc10802b6bd
Andreas Gampe [Mon, 10 Nov 2014 23:55:11 +0000 (15:55 -0800)]
Frameworks/base: Wall Werror in libs/input
Enable -Wall -Werror in libs/input. Mask warnings from Skia.
Change-Id: I0deeffde07fcf3a09eadec2852e9bf5666b55ee8
Yabin Cui [Mon, 10 Nov 2014 22:12:27 +0000 (22:12 +0000)]
Merge "kill HAVE_SCHED_SETSCHEDULER"
Yabin Cui [Mon, 10 Nov 2014 20:15:46 +0000 (12:15 -0800)]
kill HAVE_SCHED_SETSCHEDULER
Bug:
18300670
Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
Elliott Hughes [Mon, 10 Nov 2014 18:55:30 +0000 (18:55 +0000)]
Merge "bionic's struct stat is now POSIX-compliant."
Elliott Hughes [Mon, 10 Nov 2014 18:48:25 +0000 (10:48 -0800)]
bionic's struct stat is now POSIX-compliant.
One less hack needed...
Bug:
18298106
Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
Elliott Hughes [Mon, 10 Nov 2014 16:46:43 +0000 (16:46 +0000)]
Merge "Fix memory leak where we close the descriptor instead of the file."
Derek Sollenberger [Wed, 24 Sep 2014 13:20:09 +0000 (09:20 -0400)]
Fix memory leak where we close the descriptor instead of the file.
(cherry pick of
5cb769d99952ef9fb4f576abba70423fe157342b.)
bug:
17541634
Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
Andreas Gampe [Sun, 9 Nov 2014 00:37:42 +0000 (00:37 +0000)]
Merge "Frameworks/base: Fix more warnings"
Andreas Gampe [Sat, 8 Nov 2014 06:24:57 +0000 (22:24 -0800)]
Frameworks/base: Fix more warnings
Exposed by switching the target to Clang, and GCC 4.9 used by
MIPS.
Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
Andreas Gampe [Sat, 8 Nov 2014 01:14:58 +0000 (01:14 +0000)]
Merge "Frameworks/base: Wall Werror in libs/storage"
Andreas Gampe [Sat, 8 Nov 2014 01:10:49 +0000 (01:10 +0000)]
Merge "Frameworks/base: Fix two warnings in cmds"
Andreas Gampe [Sat, 8 Nov 2014 00:28:19 +0000 (16:28 -0800)]
Frameworks/base: Fix two warnings in cmds
Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
Andreas Gampe [Fri, 7 Nov 2014 22:35:42 +0000 (22:35 +0000)]
Merge "Frameworks/base: Wall Werror in libs/androidfw"
Andreas Gampe [Fri, 7 Nov 2014 22:35:32 +0000 (22:35 +0000)]
Merge "Frameworks/base: Turn on -Wall -Werror in cmds"
Andreas Gampe [Wed, 1 Oct 2014 04:48:18 +0000 (21:48 -0700)]
Frameworks/base: Turn on -Wall -Werror in cmds
Fix small warnings, turn on -Wall -Werror.
Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
Andreas Gampe [Wed, 22 Oct 2014 06:04:54 +0000 (23:04 -0700)]
Frameworks/base: Wall Werror in libs/androidfw
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.
Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
Dan Albert [Wed, 5 Nov 2014 19:29:34 +0000 (11:29 -0800)]
resolved conflicts for merge of
97014933 to stage-aosp-master
Change-Id: I078368a7452b8cdc67f299985c60eef90f144367
Dan Albert [Wed, 5 Nov 2014 18:50:09 +0000 (18:50 +0000)]
Merge "Fix a wonderful copy/paste time bomb."
Kenny Root [Mon, 3 Nov 2014 18:40:55 +0000 (18:40 +0000)]
am
b0cb0734: Merge "Track change to Conscrypt"
* commit '
b0cb07348e6320ce51d0e8b88d240ecf834850d1':
Track change to Conscrypt
Kenny Root [Mon, 3 Nov 2014 18:34:00 +0000 (18:34 +0000)]
Merge "Track change to Conscrypt"
Narayan Kamath [Mon, 3 Nov 2014 16:00:57 +0000 (16:00 +0000)]
am
5f8099ed: Merge "Add java.util.List import."
* commit '
5f8099ed181c2ba279c4a747096442389d5f8840':
Add java.util.List import.
Narayan Kamath [Mon, 3 Nov 2014 15:57:16 +0000 (15:57 +0000)]
Merge "Add java.util.List import."
Narayan Kamath [Mon, 3 Nov 2014 15:54:34 +0000 (15:54 +0000)]
Add java.util.List import.
Unused on master but used downstream.
Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
Narayan Kamath [Mon, 3 Nov 2014 14:31:11 +0000 (14:31 +0000)]
am
ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
* commit '
ef5d43a7cf694ffac8b0069aa5026862d6b32735':
Revert "Revert "Remove unused apache related API.""
Narayan Kamath [Mon, 3 Nov 2014 14:24:17 +0000 (14:24 +0000)]
Merge "Revert "Revert "Remove unused apache related API."""
Narayan Kamath [Mon, 3 Nov 2014 13:32:10 +0000 (13:32 +0000)]
Revert "Revert "Remove unused apache related API.""
This reverts commit
31f54ef8150019e4a8c501181806199ef7699fea.
Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
Kenny Root [Fri, 31 Oct 2014 17:28:04 +0000 (10:28 -0700)]
Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.
Bug:
17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
Baligh Uddin [Fri, 31 Oct 2014 17:07:16 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:07:14 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:07:12 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:07:10 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:07:07 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:07:06 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:07:03 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:07:01 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:06:54 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:06:52 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Fri, 31 Oct 2014 17:06:50 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 30 Oct 2014 22:42:25 +0000 (15:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92a4941b6135daac0a41c6763357bd8f7e1bb702
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 22:40:40 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ec7cc5a65cd0dd9e3d673cf78fdae56afff9b84
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 22:33:23 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib9142933cee63a20d7efa00b372b2685b956c8a4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 22:22:59 +0000 (15:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f5ec17cae6ffd48fac4f70c4f39337c3e094ff8
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 22:21:21 +0000 (15:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I91b710d25349dbfe01424c39b0dbfa9de6675843
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 22:19:47 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95e8c4617b42c52efbf878bdefabb0486a489e38
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 22:17:39 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95840329225909e062fe2221603ac91004517544
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 20:22:12 +0000 (13:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25d2ae8de65186cd9cb3e6447c661a507c2be2df
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 20:17:29 +0000 (13:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cc5677cc67dff0777c4bd2960d085003d6f98a5
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 20:15:49 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I37bac04e94e138a6bea3d16bbbad8926bf3d98bd
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 20:12:29 +0000 (13:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d284a5f27834737993c75974cc5b3361a157f4e
Auto-generated-cl: translation import
Baligh Uddin [Thu, 30 Oct 2014 18:34:37 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb9bd8d9ad878936b39a754d968d1bd84d3e9b74
Auto-generated-cl: translation import
Elliott Hughes [Thu, 30 Oct 2014 03:06:12 +0000 (03:06 +0000)]
am
c8dce896: Merge "Fix not to show a log with empty default ime"
* commit '
c8dce8966b84203befb87a24a9d2d8ee87a39f7b':
Fix not to show a log with empty default ime
Elliott Hughes [Thu, 30 Oct 2014 03:01:59 +0000 (03:01 +0000)]
Merge "Fix not to show a log with empty default ime"
Hyejin Kim [Mon, 27 Oct 2014 08:17:06 +0000 (17:17 +0900)]
Fix not to show a log with empty default ime
It'll make reboot to show a log with empty defualt ime.
Bug:
18165757
Change-Id: Ieec2532cbe003cb6307a70748a2f6c8987708eae
Vladimir Marko [Wed, 29 Oct 2014 21:57:16 +0000 (21:57 +0000)]
am
e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."
* commit '
e5fe7f3f4069b176a0465617dceb630a52b710c0':
Fix android_media_AudioSystem_getMasterMute return type.
Vladimir Marko [Wed, 29 Oct 2014 21:52:02 +0000 (21:52 +0000)]
Merge "Fix android_media_AudioSystem_getMasterMute return type."
Vladimir Marko [Wed, 29 Oct 2014 20:34:15 +0000 (20:34 +0000)]
Fix android_media_AudioSystem_getMasterMute return type.
Caused FPU stack overflow on x86.
Bug:
18023418
(cherry picked from commit
c1bcdbb75877d99972f1cd13a9c40126822621bc)
Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
Calin Juravle [Wed, 29 Oct 2014 13:21:09 +0000 (13:21 +0000)]
am
43a92646: Merge "Use native brige only if we have a private data directory."
* commit '
43a9264619e08f464dd4f184e53441a440cca09f':
Use native brige only if we have a private data directory.
Calin Juravle [Wed, 29 Oct 2014 13:15:49 +0000 (13:15 +0000)]
Merge "Use native brige only if we have a private data directory."
Calin Juravle [Tue, 28 Oct 2014 12:16:21 +0000 (12:16 +0000)]
Use native brige only if we have a private data directory.
Bug:
18027433
Change-Id: I59b1b1cbe1d7d14b93d8bb6d4255c951d9e469b6
Narayan Kamath [Wed, 29 Oct 2014 12:12:37 +0000 (12:12 +0000)]
resolved conflicts for merge of
3028394c to stage-aosp-master
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
Narayan Kamath [Wed, 29 Oct 2014 11:30:11 +0000 (11:30 +0000)]
am
e87d36f8: Merge "Revert "Remove unused apache related API.""
* commit '
e87d36f8925a34f85ba80c886757d07ad03fed42':
Revert "Remove unused apache related API."
Narayan Kamath [Wed, 29 Oct 2014 11:23:45 +0000 (11:23 +0000)]
resolved conflicts for merge of
9834af9c to stage-aosp-master
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
Narayan Kamath [Wed, 29 Oct 2014 05:47:26 +0000 (05:47 +0000)]
am
00fd3639: Merge "Remove tests/SslLoad."
* commit '
00fd36399fd8dd9566b582c24817d130982bc270':
Remove tests/SslLoad.
Andreas Gampe [Wed, 29 Oct 2014 03:42:53 +0000 (20:42 -0700)]
resolved conflicts for merge of
3c8cf51f into stage-aosp-master
Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb
Calin Juravle [Tue, 28 Oct 2014 19:28:42 +0000 (19:28 +0000)]
am
f7d24d24: Merge "PreInitializeNativeBridge only if its Available"
* commit '
f7d24d244319599f62c22e29c3e6540d6cbadf49':
PreInitializeNativeBridge only if its Available
Elliott Hughes [Tue, 28 Oct 2014 04:39:24 +0000 (04:39 +0000)]
am
ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit '
ced7ebdb1d522b4206e2048b278554ca841aeaba':
Migrate off timeFormat12 and timeFormat24.
Chih-Hung Hsieh [Mon, 27 Oct 2014 18:36:51 +0000 (18:36 +0000)]
Merge "Suppress Clang compilation warnings."
Narayan Kamath [Mon, 27 Oct 2014 16:55:41 +0000 (16:55 +0000)]
Merge "Revert "Remove unused apache related API.""
Narayan Kamath [Mon, 27 Oct 2014 16:55:14 +0000 (16:55 +0000)]
Revert "Remove unused apache related API."
This reverts commit
3f2714e18bfd979aefefa1d45c50a69fca21cf14.
Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
Narayan Kamath [Mon, 27 Oct 2014 16:17:20 +0000 (16:17 +0000)]
Merge "Remove unused apache related API."
Narayan Kamath [Mon, 27 Oct 2014 16:16:22 +0000 (16:16 +0000)]
Merge "Remove tests/SslLoad."
Narayan Kamath [Mon, 27 Oct 2014 16:16:10 +0000 (16:16 +0000)]
Merge "Stop using apache http to download Gps XTRA data."
Calin Juravle [Mon, 27 Oct 2014 15:16:03 +0000 (15:16 +0000)]
Merge "PreInitializeNativeBridge only if its Available"
Calin Juravle [Fri, 24 Oct 2014 15:16:49 +0000 (16:16 +0100)]
PreInitializeNativeBridge only if its Available
Also, assert that we always have a private application directory for non
system_server case.
Change-Id: I8397d7f7b04cde0bf65b60ca415bf3f4b349783c
Chih-Hung Hsieh [Mon, 15 Sep 2014 21:28:52 +0000 (14:28 -0700)]
Suppress Clang compilation warnings.
Ignore warnings about unused parameters and initialization of static
constant float data members.
Change one potential error of allocating variable length
array of non-POD element type on stack.
Fix mismatch of class and struct declaration tags.
BUG:
17512760
Change-Id: I3a09c945fb1c17f27aff74a7e439dd4c35d1fb32
Craig Mautner [Fri, 24 Oct 2014 20:12:08 +0000 (13:12 -0700)]
resolved conflicts for merge of
2bf3800b to stage-aosp-master
Change-Id: I3e650f90521e4d615504c3423ab228966389a482
Narayan Kamath [Fri, 24 Oct 2014 13:22:21 +0000 (14:22 +0100)]
Remove unused apache related API.
Hidden and used only in unit tests.
Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
Narayan Kamath [Fri, 24 Oct 2014 13:16:41 +0000 (14:16 +0100)]
Remove tests/SslLoad.
Crufty code that hasn't been touched in the past five years.
The test seems generally useless and there are dozens of richer
tests and benchmarks in conscrypt and libcore.
Change-Id: Ifbec8d419fd37f3b6323c9c74f47d0b7c85c9d4b
Narayan Kamath [Fri, 24 Oct 2014 12:23:45 +0000 (13:23 +0100)]
Stop using apache http to download Gps XTRA data.
Also, general cleanup of unused parameters.
Change-Id: Iebd1aa05de9cd676b0b6d08c99df8c15b8e8473c
Elliott Hughes [Thu, 23 Oct 2014 18:21:56 +0000 (18:21 +0000)]
Merge "Migrate off timeFormat12 and timeFormat24."
Elliott Hughes [Thu, 23 Oct 2014 18:06:43 +0000 (11:06 -0700)]
Migrate off timeFormat12 and timeFormat24.
libcore now offers a wider variety of 12-/24-hour time formats,
so be more specific about which one we want here.
(cherry-pick of
85f60d3a03b5b5d9a0e8b8a138eb85a6b53a1eca.)
Bug:
10361358
Change-Id: I846ab7a6f84cd49e876ad21e9366aff1600e0530
OSDN Git Service
