drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,929 Commits 1 Branch 0 Tags
Commit Graph

158929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
f89a2fdacb Merge "Frameworks/base: Fix two warnings in cmds" 2014-11-08 01:10:50 +00:00
Andreas Gampe
ebee1379ea Frameworks/base: Fix two warnings in cmds 
Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
 2014-11-08 01:04:45 +00:00
Andreas Gampe
487ae9b8dc Merge "Frameworks/base: Wall Werror in libs/androidfw" 2014-11-07 22:35:42 +00:00
Andreas Gampe
e80c01e8d1 Merge "Frameworks/base: Turn on -Wall -Werror in cmds" 2014-11-07 22:35:32 +00:00
Andreas Gampe
cfedceb8c1 Frameworks/base: Turn on -Wall -Werror in cmds 
Fix small warnings, turn on -Wall -Werror.

Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
 2014-11-07 14:33:51 -08:00
Andreas Gampe
2204f0bf56 Frameworks/base: Wall Werror in libs/androidfw 
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.

Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
 2014-11-07 13:35:05 -08:00
Jörgen Ekström
da44fe0e1f Fixing NULL pointer access causing segmentation fault in aapt 
In cases where resource packages are generated which does
not have public resources for all resource types - NULL
pointers sneaks into the mOrderedConfigs vector causing
the aapt tool to crash. The solution in this fix simply
ignores the NULL elements when later processing the sorted
vector.

The NULL elements are inserted during applyPublicEntryOrder
function call

Change-Id: I8b7135932e2d235018da2e2f7e09f0d22f1b2f59
 2014-11-07 13:41:06 +00:00
Mattias Petersson
fc2bd335d1 Fix for CharSequenceCreator test case 
The test case testCharSequenceCreator() in TextUtilsTest fails
because the data position is not reset before calling
createFromParcel().

Change-Id: I6d5cc093ff65019ab0d2191bb0bd9c10ae49612b
 2014-11-07 12:27:28 +00:00
Dan Albert
59701b9ba5 resolved conflicts for merge of 97014933 to stage-aosp-master 
Change-Id: I078368a7452b8cdc67f299985c60eef90f144367
 2014-11-05 11:29:34 -08:00
Dan Albert
97014933f0 Merge "Fix a wonderful copy/paste time bomb." 2014-11-05 18:50:10 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
 2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
Narayan Kamath
10ac55ba4f am 5f8099ed: Merge "Add java.util.List import." 
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
  Add java.util.List import.
 2014-11-03 16:00:57 +00:00
Narayan Kamath
5f8099ed18 Merge "Add java.util.List import." 2014-11-03 15:57:17 +00:00
Narayan Kamath
2b4378fef8 Add java.util.List import. 
Unused on master but used downstream.

Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
 2014-11-03 15:55:03 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Narayan Kamath
ef5d43a7cf Merge "Revert "Revert "Remove unused apache related API.""" 2014-11-03 14:24:17 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Kenny Root
8a97063720 Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2014-10-31 12:06:09 -07:00
Baligh Uddin
9ce5f3d3da Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:17 +00:00
Baligh Uddin
4203242f22 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:15 +00:00
Baligh Uddin
6f259bcb11 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:15 +00:00
Baligh Uddin
1e3f951b41 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:11 +00:00
Baligh Uddin
b91096729c Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:10 +00:00
Baligh Uddin
11fa3ca7a5 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:07 +00:00
Baligh Uddin
8900e55113 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:04 +00:00
Baligh Uddin
f93c7a1f77 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:07:03 +00:00
Baligh Uddin
9431000561 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:06:56 +00:00
Baligh Uddin
6a9c07102a Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:06:55 +00:00
Baligh Uddin
eda5438f6d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2014-10-31 17:06:51 +00:00
Baligh Uddin
e219039d4c Import translations. DO NOT MERGE 
Change-Id: I92a4941b6135daac0a41c6763357bd8f7e1bb702
Auto-generated-cl: translation import
 2014-10-30 15:42:25 -07:00
Baligh Uddin
8ce3a1b676 Import translations. DO NOT MERGE 
Change-Id: I2ec7cc5a65cd0dd9e3d673cf78fdae56afff9b84
Auto-generated-cl: translation import
 2014-10-30 15:40:40 -07:00
Baligh Uddin
cce45a2863 Import translations. DO NOT MERGE 
Change-Id: Ib9142933cee63a20d7efa00b372b2685b956c8a4
Auto-generated-cl: translation import
 2014-10-30 15:33:23 -07:00
Baligh Uddin
eb37dd5b47 Import translations. DO NOT MERGE 
Change-Id: I1f5ec17cae6ffd48fac4f70c4f39337c3e094ff8
Auto-generated-cl: translation import
 2014-10-30 15:22:59 -07:00
Baligh Uddin
a061f683ce Import translations. DO NOT MERGE 
Change-Id: I91b710d25349dbfe01424c39b0dbfa9de6675843
Auto-generated-cl: translation import
 2014-10-30 15:21:21 -07:00
Baligh Uddin
c50cd28f6c Import translations. DO NOT MERGE 
Change-Id: I95e8c4617b42c52efbf878bdefabb0486a489e38
Auto-generated-cl: translation import
 2014-10-30 15:19:47 -07:00
Baligh Uddin
7febe5985c Import translations. DO NOT MERGE 
Change-Id: I95840329225909e062fe2221603ac91004517544
Auto-generated-cl: translation import
 2014-10-30 15:17:39 -07:00
Baligh Uddin
7b2c26dce9 Import translations. DO NOT MERGE 
Change-Id: I25d2ae8de65186cd9cb3e6447c661a507c2be2df
Auto-generated-cl: translation import
 2014-10-30 13:22:12 -07:00
Baligh Uddin
0aa10d44ed Import translations. DO NOT MERGE 
Change-Id: I1cc5677cc67dff0777c4bd2960d085003d6f98a5
Auto-generated-cl: translation import
 2014-10-30 13:17:29 -07:00
Baligh Uddin
abeca149d7 Import translations. DO NOT MERGE 
Change-Id: I37bac04e94e138a6bea3d16bbbad8926bf3d98bd
Auto-generated-cl: translation import
 2014-10-30 13:15:49 -07:00
Baligh Uddin
8db41fe7b0 Import translations. DO NOT MERGE 
Change-Id: I5d284a5f27834737993c75974cc5b3361a157f4e
Auto-generated-cl: translation import
 2014-10-30 13:12:29 -07:00
Baligh Uddin
ea678bcc43 Import translations. DO NOT MERGE 
Change-Id: Ibb9bd8d9ad878936b39a754d968d1bd84d3e9b74
Auto-generated-cl: translation import
 2014-10-30 11:34:37 -07:00
Elliott Hughes
b6e004261c 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
 2014-10-30 03:06:12 +00:00
Elliott Hughes
c8dce8966b Merge "Fix not to show a log with empty default ime" 2014-10-30 03:02:01 +00:00
Hyejin Kim
e6ef68b15a 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
 2014-10-30 09:22:17 +09:00
Vladimir Marko
548101cb96 am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 21:57:16 +00:00
Vladimir Marko
e5fe7f3f40 Merge "Fix android_media_AudioSystem_getMasterMute return type." 2014-10-29 21:52:02 +00:00
Vladimir Marko
b4b5518c81 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418

(cherry picked from commit c1bcdbb75877d99972f1cd13a9c40126822621bc)

Change-Id: Ia1b5a1da52b20c2e0a84321e784cd795ec649e66
 2014-10-29 21:18:00 +00:00
Calin Juravle
5d5e4b14f6 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.
 2014-10-29 13:21:09 +00:00
Calin Juravle
43a9264619 Merge "Use native brige only if we have a private data directory." 2014-10-29 13:15:49 +00:00