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

11698 Commits

Author SHA1 Message Date
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Andreas Gampe
577f48c1c9 Frameworks/base: Fix build 
Fix a typo.

Change-Id: Ida417c842563576b053d9f5553a2aa8d5862897c
 2014-11-13 15:44:27 -08:00
Andreas Gampe
423ba098bd Frameworks/base: Wall Werror in packages 
Turn on -Wall -Werror in packages/. Fix warnings.

Change-Id: I4ec7256a7df46017e1895575719f2b5aca978bd0
 2014-11-13 15:25:34 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08: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
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
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
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-28 04:39:24 +00: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
Adrian Roos
d159e0353c am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit '9c5896b808f77295aa5cd09cb37ad01bccd7994c':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:03:54 +00:00
Adrian Roos
9c5896b808 Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 2014-10-20 12:59:00 +00:00
Baligh Uddin
a4cbfb822e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:39 +00:00
Baligh Uddin
3b7e7817c5 Import translations. DO NOT MERGE 
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
 2014-10-19 13:18:18 -07:00
Baligh Uddin
4199680a9d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
7fda5c91e5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
cfccba99a2 Import translations. DO NOT MERGE 
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import
 2014-10-19 10:56:51 -07:00
Baligh Uddin
b18d26738d Import translations. DO NOT MERGE 
Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import
 2014-10-19 10:52:12 -07:00
Baligh Uddin
7d369a6d5b Import translations. DO NOT MERGE 
Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import
 2014-10-19 10:50:27 -07:00
Jorim Jaggi
89f7f281e3 Always execute resumeAppSwitches when launching something 
Bug: 18024449
Change-Id: Ib5ea92d141d74676d00fd3118930bdb0ef5b2935
 2014-10-17 19:57:38 +02:00
Neil Fuller
5a135a1cbb am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
 2014-10-17 14:59:41 +00:00
Geoff Mendal
c71a7b3cb8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-16 01:35:18 +00:00
Geoff Mendal
874633e378 Import translations. DO NOT MERGE 
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
 2014-10-15 18:34:07 -07:00
Tom Taylor
1e7c2c8738 am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 
* commit '6d4f4575463ef5fdcdfbf3118a893ecbdb14a02b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 23:57:03 +00:00
Tom Taylor
48ed835468 Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
Bug 17969135

Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.

Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
 2014-10-15 10:20:17 -07:00
Neil Fuller
6de42dac43 Removing some more FloatMath references 
See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I46d4ee4c4be7972e3bcc6782fb50f024b6fff1ee
 2014-10-15 11:45:45 +01:00
Jason Monk
17fcd47743 am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit 'f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a':
  Update screen pinning and recents strings to say Overview
 2014-10-14 22:47:23 +00:00
Jason Monk
f97e71a6dd Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 2014-10-14 22:42:55 +00:00
Selim Cinek
7a140bd488 am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit 'cedb6dc7f2e19120d6889bc681d143bfb2891b80':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 22:31:32 +00:00
Selim Cinek
cedb6dc7f2 Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 2014-10-14 22:28:25 +00:00
Svetoslav
9784d4b8f3 am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '0a1ffdb3f89705eeeb89349fcd31c82b2d15b0a5':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 22:15:09 +00:00
Svetoslav
05e041b013 Handle if the printing app is killed while saving to PDF. 
When saving to PDF we bring up the file picker UI which covers
the print UI. In this case the printing app may get killed as
it is not in the forground (the system is bound to the print
spooler so it cannot get killed). If that happens we are ending
up with an empty file. However, if the file chooser UI is up
we already have everything from the app we need and it dying
does not matter. This change takes care if ignoring printing
app death while saving to PDF.

bug:17922948

Change-Id: I10d808e3c3e93e850dbc2a948f2482381a887928
 2014-10-14 14:16:12 -07:00