Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,797 Commits 3 Branches 0 Tags
11fa3ca7a585c4bdbaa30dc28308faae08a591e0
Commit Graph

158797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 c1bcdbb758)

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
Calin Juravle
6a4d2369e5 Use native brige only if we have a private data directory. 
Bug: 18027433

Change-Id: I59b1b1cbe1d7d14b93d8bb6d4255c951d9e469b6
 2014-10-29 12:40:03 +00:00
Narayan Kamath
4ed472ab33 resolved conflicts for merge of 3028394c to stage-aosp-master 
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
 2014-10-29 12:12:37 +00:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +00:00
Narayan Kamath
b27ea56312 am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '00fd36399fd8dd9566b582c24817d130982bc270':
  Remove tests/SslLoad.
 2014-10-29 05:47:26 +00:00
Andreas Gampe
dfdc6acc48 resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb
 2014-10-28 20:42:53 -07:00
Calin Juravle
5d4deb8246 am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit 'f7d24d244319599f62c22e29c3e6540d6cbadf49':
  PreInitializeNativeBridge only if its Available
 2014-10-28 19:28:42 +00:00
Elliott Hughes
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-28 04:39:24 +00:00
Chih-Hung Hsieh
3028394c46 Merge "Suppress Clang compilation warnings." 2014-10-27 18:36:52 +00:00
Narayan Kamath
e87d36f892 Merge "Revert "Remove unused apache related API."" 2014-10-27 16:55:42 +00:00
Narayan Kamath
31f54ef815 Revert "Remove unused apache related API." 
This reverts commit 3f2714e18b.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
 2014-10-27 16:55:14 +00:00
Narayan Kamath
9834af9ccf Merge "Remove unused apache related API." 2014-10-27 16:17:21 +00:00
Narayan Kamath
00fd36399f Merge "Remove tests/SslLoad." 2014-10-27 16:16:23 +00:00
Narayan Kamath
3c8cf51f86 Merge "Stop using apache http to download Gps XTRA data." 2014-10-27 16:16:11 +00:00
Calin Juravle
f7d24d2443 Merge "PreInitializeNativeBridge only if its Available" 2014-10-27 15:16:03 +00:00
Calin Juravle
79ec4c15ab PreInitializeNativeBridge only if its Available 
Also, assert that we always have a private application directory for non
system_server case.

Change-Id: I8397d7f7b04cde0bf65b60ca415bf3f4b349783c
 2014-10-27 14:45:33 +00:00
Chih-Hung Hsieh
d3448e437a 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
 2014-10-24 15:42:14 -07:00
Craig Mautner
9d9aac4cac resolved conflicts for merge of 2bf3800b to stage-aosp-master 
Change-Id: I3e650f90521e4d615504c3423ab228966389a482
 2014-10-24 13:12:08 -07:00
Narayan Kamath
3f2714e18b Remove unused apache related API. 
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
 2014-10-24 14:27:07 +01:00
Narayan Kamath
3f2d1a460a 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
 2014-10-24 14:16:41 +01:00
Narayan Kamath
c273edbba5 Stop using apache http to download Gps XTRA data. 
Also, general cleanup of unused parameters.

Change-Id: Iebd1aa05de9cd676b0b6d08c99df8c15b8e8473c
 2014-10-24 13:41:27 +01:00
Elliott Hughes
ced7ebdb1d Merge "Migrate off timeFormat12 and timeFormat24." 2014-10-23 18:21:56 +00:00
Elliott Hughes
f7d5e0a53e 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
 2014-10-23 11:18:21 -07:00
Craig Mautner
2bf3800b10 Merge "Doesn't re-sort app windows when move task to top" 2014-10-22 21:19:43 +00:00
Bill Yi
5a71f83227 Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master 
Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
 2014-10-22 09:00:49 -07:00
tingna_sung
27d2ea2242 Doesn't re-sort app windows when move task to top 
To avoid app window isn't moved by new task order when move task to top

Change-Id: I5f8a901bb2f20a163b7fa0a59d1dc58c1fca5f1f
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-10-22 11:58:06 +08:00
Craig Mautner
52656916e3 am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort" 
* commit '4c1010152e487d3471e6703e8a9f8c1010488d47':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
 2014-10-21 19:45:41 +00:00
Craig Mautner
4c1010152e Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort" 2014-10-21 19:24:18 +00:00
Elliott Hughes
09a7d324ef am 388dbd28: Merge "Include <time.h> for clock_nanosleep." 
* commit '388dbd28ac977782c2ff7a0ba97e2fbfaebfed4b':
  Include <time.h> for clock_nanosleep.
 2014-10-21 17:53:50 +00:00