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

11658 Commits

Author SHA1 Message Date
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
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
Jason Monk
cdc459feb2 Update screen pinning and recents strings to say Overview 
Bug: 17969466
Bug: 17970142
Change-Id: I76cd934ea6d67f36609fdc53ca1d195fcb7dcfbe
 2014-10-14 15:10:10 -04:00
Selim Cinek
02af41efe5 Fixed a bug when double tapping a notification in the normal shade 
This fixes that sometimes holes where created when grabbing the panel while
closing the shade (eg. double tapping) or the notifications did not disappear.
It could also happen when using the clear all button.

Bug: 17969040
Bug: 17899136
Bug: 17961295
Bug: 17551216
Change-Id: Id7aa37bbcbae504039f90686e2bc364d18685205
 2014-10-14 15:46:43 +02:00
Jeff Sharkey
2134aa9c86 am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:03:18 +00:00
Jeff Sharkey
b7b30f691c DocumentsUI: Add content description for nav. 
Bug: 17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
 2014-10-13 12:55:18 -07:00
Geoff Mendal
84323907e4 Import translations. DO NOT MERGE 
Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774
Auto-generated-cl: translation import
 2014-10-13 10:05:28 -07:00
Selim Cinek
41de47c995 am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit '2c461def93f235d3a7853851ee125cb3caaf2955':
  Fixed missing translation for wallpaper cropper
 2014-10-10 21:18:41 +00:00
Selim Cinek
2c461def93 Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 2014-10-10 21:14:34 +00:00
Selim Cinek
b7cde675a2 Fixed missing translation for wallpaper cropper 
Also a fixed a small visibility issue.

Bug: 17927204
Change-Id: Ia9566fe8fe0c70f83edc295b0bf8317e94eb85fe
 2014-10-10 13:55:36 -07:00
Selim Cinek
da37a460dd am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '3e683b6a0f40e176ba9ffce652939ecef23b9dc2':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 18:53:12 +00:00
Selim Cinek
3e683b6a0f Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 2014-10-10 18:49:12 +00:00
Selim Cinek
6bb4a9b356 Fixed a bug where the panel got into a wrong state 
Bug: 17939708
Change-Id: Ieaa9dc2fc0c92ce52b02ac4ea452df47ee492ac3
 2014-10-09 17:48:05 -07:00
Selim Cinek
205bab06d8 am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit 'f9df9dd845ba1d1b14b450bd9df654243921381f':
  Fixed an issue where the notification could become transparent
 2014-10-09 23:07:21 +00:00
Selim Cinek
f9df9dd845 Merge "Fixed an issue where the notification could become transparent" into lmp-dev 2014-10-09 23:05:04 +00:00
Selim Cinek
59d9723dd7 Fixed an issue where the notification could become transparent 
Bug: 17668881
Change-Id: If8389084c7696bb8d3c0155f1262ec1fe7973c44
 2014-10-09 15:54:40 -07:00
Christoph Studer
d9364908bc am 2c2cb29a: Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 
* commit '2c2cb29a3d7f0a90d753b0fa9c32c1fc5cdbff32':
  WallpaperCropper: Use white color for action bar
 2014-10-09 21:01:29 +00:00
Christoph Studer
2c2cb29a3d Merge "WallpaperCropper: Use white color for action bar" into lmp-dev 2014-10-09 20:56:45 +00:00
Christoph Studer
9e8482062d WallpaperCropper: Use white color for action bar 
Bug: 17343815
Change-Id: I5802f04204d081b97fbc2e2cb203fa03f16fea6a
 2014-10-09 13:50:21 -07:00
Jorim Jaggi
3601aeb6d4 am 01f1c5c8: Merge "Fix content description for bluetooth icon" into lmp-dev 
* commit '01f1c5c85476b7eee3155ac1a1f6b570582ecd6c':
  Fix content description for bluetooth icon
 2014-10-09 19:15:24 +00:00
Jorim Jaggi
2d75f9fd17 Fix content description for bluetooth icon 
Bug: 17921584
Change-Id: I908d31aaa15188baffee76933a3025bad6bc2631
 2014-10-09 10:43:52 -07:00
Dianne Hackborn
529b78941c am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-08 22:48:44 +00:00
Geoff Mendal
49c5ddd677 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-08 19:53:12 +00:00
Geoff Mendal
3306875740 Import translations. DO NOT MERGE 
Change-Id: I38a6ea57b8a5cde20e80427bcb46caf0b1048d2c
Auto-generated-cl: translation import
 2014-10-08 11:53:40 -07:00
Dianne Hackborn
89b196958f Merge "Put in real "code" (aka marketing) name." into lmp-dev 2014-10-08 17:59:19 +00:00
Dan Sandler
324cab8378 am 2200f86f: All (er, L) is finally revealed. 
* commit '2200f86f800876d005f911e6864708fa9772d03a':
  All (er, L) is finally revealed.
 2014-10-08 04:07:16 +00:00
Dan Sandler
2200f86f80 All (er, L) is finally revealed. 
If you exceed 20000 points, please send in a screenshot.

Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
 2014-10-08 04:01:01 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Jim Miller
d30d78f9d0 am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit '52403d6f8e9a0e31a0f880a9cd297aeb35c29c8e':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 00:37:16 +00:00
Jim Miller
e8fed24be6 Fix "Wrong password" message shown when using BT keyboard. 
The code was assuming we're always using soft IME. When a physical
keyboard is attached, we get two events; ACTION_DOWN and ACTION_UP.
The code attempted to unlock the device twice.  The second attempt
failed because the TextView was cleared by the first successful attempt.

Fixes bug 17690585

Change-Id: Ia92a97400b4404d0cbe86aacb727009e95914327
 2014-10-07 16:50:04 -07:00
Jason Monk
1229a372a7 am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 20:47:09 +00:00
Jorim Jaggi
c746ef5179 am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit '988a8a9820bb3ae331be4932eb9e672a4614efd5':
  Update 'No notifications' text on configuration change
 2014-10-07 19:58:56 +00:00
Jason Monk
733bcc7fbe Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev 2014-10-07 18:53:20 +00:00
Jason Monk
20ef4024ed Hide hotspot tile if 'provisioning' is needed 
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.

Bug: 17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
 2014-10-07 14:43:11 -04:00
Amith Yamasani
53322b9f7b am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 18:27:10 +00:00
Jorim Jaggi
988a8a9820 Merge "Update 'No notifications' text on configuration change" into lmp-dev 2014-10-07 17:48:01 +00:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
John Spurlock
c32105d7b9 am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.
 2014-10-07 16:22:24 +00:00
John Spurlock
92b8d41096 Doze: Avoid pulsing in pockets. 
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.

Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
 2014-10-07 12:01:56 -04:00
PauloftheWest
2b5fe1cd2e am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit '53c84002911362c913bc72cd28d186718a33149d':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 13:06:06 +00:00
PauloftheWest
53c8400291 Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 2014-10-07 13:01:28 +00:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms 
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
 2014-10-06 18:24:32 -07:00