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

160328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sangkyu Lee
a12b2405df Prevent calling GL functions with an invalid surface 
Bug: 18518580

When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)

Cherry picked from AOSP: f76d36f96bf221672e98e440c9df7cbf0e02e84e

Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
 2014-12-01 21:38:34 +00:00
Ihab Awad
ac70c64731 Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev 2014-12-01 21:35:30 +00:00
Craig Mautner
94dab3ae54 am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev 
* commit '9dba10732802bf162c0098d2591aa284e55b7b5e':
  Force additional layout pass after drawing
 2014-12-01 21:00:51 +00:00
Craig Mautner
9dba107328 Merge "Force additional layout pass after drawing" into lmp-mr1-dev 2014-12-01 20:56:09 +00:00
Wale Ogunwale
e05fbd6901 am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit '997e632f59b070dabf71d9e807847c0643da92ac':
  Added unique id to display devices and their settings.
 2014-12-01 20:30:33 +00:00
Ihab Awad
de06133569 Fix to a compatibility patch that was missed in ag/587241 
Change-Id: I2339085a9a2cc0d6a3f4b5e07130b5178a62c729
 2014-12-01 12:30:00 -08:00
Wale Ogunwale
997e632f59 Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 2014-12-01 20:26:06 +00:00
Shishir Agrawal
592707c525 am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 
* commit '089f95f4483c95873cf0084c11cb23a0f5b32c3c':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
 2014-12-01 20:22:36 +00:00
Shishir Agrawal
089f95f448 Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev 2014-12-01 20:17:26 +00:00
Chris Craik
1fd78e9268 am 659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 
* commit '659de832b9796e14de44b6411980a65e33283a93':
  Enable stencil clipping within clearLayerRegions
 2014-12-01 20:13:06 +00:00
Chris Craik
659de832b9 Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 2014-12-01 20:08:29 +00:00
Geoff Mendal
f93c82ae36 am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f90404ca7b47234437b3f8f418fca313825de02c':
  Import translations. DO NOT MERGE
 2014-12-01 19:50:17 +00:00
Joe Fernandez
2cbfc8455d am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '353da3f98d86eb750b756335892c768f76cc4616':
  docs: December 2014 Dashboard update
 2014-12-01 19:50:12 +00:00
smain@google.com
e979e259d2 am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit '77e889ed84ea0f626a9164fad50299d131a1cac1':
  change Trulia context image
 2014-12-01 19:50:07 +00:00
Shishir Agrawal
0201a6f6f1 TelephonyManager.setLine1NumberForDisplay should return a boolean. 
The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
 2014-12-01 11:48:53 -08:00
Geoff Mendal
f90404ca7b am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ff26f10fab3e79d535001b8e1c9155d7844375c4':
  Import translations. DO NOT MERGE
 2014-12-01 19:44:10 +00:00
Joe Fernandez
353da3f98d am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
  docs: December 2014 Dashboard update
 2014-12-01 19:44:04 +00:00
smain@google.com
77e889ed84 am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit '446bab79564e50c497e6ce5cf75a30ddd94855fe':
  change Trulia context image
 2014-12-01 19:43:58 +00:00
Jeremy Joslin
33783a962f am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 
* commit '500f781110dee5aad53410e9ef9b4003123c6981':
  Fix the ordering of extra values in the PI.
 2014-12-01 19:42:24 +00:00
Jeremy Joslin
500f781110 Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 2014-12-01 19:36:04 +00:00
Alan Viverette
53644fb5ac am 015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 
* commit '015b9e56d4ad528dd406672ef6264c85e41a20fd':
  Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
 2014-12-01 19:17:30 +00:00
Alan Viverette
015b9e56d4 Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev 2014-12-01 19:12:49 +00:00
Geoff Mendal
ff26f10fab Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-12-01 19:11:04 +00:00
Geoff Mendal
5ba33370d8 Import translations. DO NOT MERGE 
Change-Id: I48e6cd1b92557727fbd8ee2d803f0121538831d9
Auto-generated-cl: translation import
 2014-12-01 11:09:20 -08:00
Geoff Mendal
533371c592 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-01 19:04:59 +00:00
Jeff Sharkey
05d455ca2b am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit 'b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
  Sanitize display names, keep extensions intact.
 2014-12-01 19:00:56 +00:00
Jeff Sharkey
916d516349 am e4a5faa6: Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev 
* commit 'e4a5faa61e9084333b241531ddb941684f110566':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-12-01 19:00:51 +00:00
Geoff Mendal
4618091212 Import translations. DO NOT MERGE 
Change-Id: Ic9c2d5dfcae9b229040c8460ab2a9820d44fa18c
Auto-generated-cl: translation import
 2014-12-01 10:59:03 -08:00
Joe Fernandez
88e04fcbc6 am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit 'e9a816c5934e4c12a865fdab4994ea286c01009d':
  docs: December 2014 Dashboard update
 2014-12-01 18:58:36 +00:00
Jeff Sharkey
b9ccc047ca Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 2014-12-01 18:57:09 +00:00
Jeff Sharkey
e4a5faa61e Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev 2014-12-01 18:56:57 +00:00
Joe Fernandez
e9a816c593 am 1f5acf84: docs: December 2014 Dashboard update 
* commit '1f5acf84800f58607e5e9f36c48e3b53f10c1163':
  docs: December 2014 Dashboard update
 2014-12-01 18:51:54 +00:00
Joe Fernandez
1f5acf8480 docs: December 2014 Dashboard update 
Change-Id: I80e2477d02ef5eb0964ae6e68ffa11d703db4fe5
 2014-12-01 10:40:54 -08:00
Lorenzo Colitti
829dfa7cd8 Only use mDefaultDns if the network claims to offer Internet 
Currently, if a network does not specify DNS servers, we default
it to using 8.8.8.8. This was done because the emulator did not
specify DNS servers. However, it causes queries to fail slowly,
instead of failing fast, on networks that do not have
connectivity to 8.8.8.8.

Bug: 18327075
Change-Id: I0df13ff4a17ee65e640be96695a3af31b020963a
 2014-12-02 03:40:16 +09:00
Jason Monk
c0c34b428f am 03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 
* commit '03d705abd60dcd918ae7dcce4c9c48299c1c4995':
  SysUI: QS Wifi get connected wifi rssi from NC
 2014-12-01 18:38:19 +00:00
Amith Yamasani
0c81034cac am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit '731a5c1a29e5bdbf6e7e4bade9b80f7abe6ec37e':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 18:38:14 +00:00
Jason Monk
03d705abd6 Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev 2014-12-01 18:33:39 +00:00
Amith Yamasani
731a5c1a29 Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 2014-12-01 18:32:11 +00:00
smain@google.com
446bab7956 am 7512a46e: am fdff66ee: change Trulia context image 
* commit '7512a46e7e9dfcd6e522e8229b91a63b9e9189de':
  change Trulia context image
 2014-12-01 18:08:58 +00:00
smain@google.com
7512a46e7e am fdff66ee: change Trulia context image 
* commit 'fdff66ee030869f0f5cb3d1614d66f7d087e2008':
  change Trulia context image
 2014-12-01 18:04:39 +00:00
smain@google.com
fdff66ee03 change Trulia context image 
Change-Id: I99e43b358af518750cf7ddae4856bb8ee42729f5
 2014-12-01 09:40:42 -08:00
Jeff Sharkey
0cce5355b4 Sanitize display names, keep extensions intact. 
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames.  This also fixes
a handful of directory traversal bugs.

Also relax logic around generating display names to allow any
extension which maps to the requested MIME type.  Tests to verify.

Bug: 18512473, 18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
 2014-12-01 09:38:49 -08:00
Akira Numata
48e17629b0 APK still has privileged flag after being moved from "/system/priv-app" 
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.

(cherry picked from commit 76bf60ead8132b86436ebbba40eaa8f2c8bbe812)

Change-Id: I39feeac7ece89c28045d196ae69fc974b1c6510b
 2014-12-01 09:38:48 -08:00
Geoff Mendal
e7f81f3b68 am 6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6ca3ba73b78be57dd50fe5813f076b3e166cc659':
  Import translations. DO NOT MERGE
 2014-12-01 17:31:28 +00:00
Geoff Mendal
6ca3ba73b7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-01 17:26:20 +00:00
Geoff Mendal
8802ec14a5 Import translations. DO NOT MERGE 
Change-Id: I8d79c516d1b137f23ec8f4178d156f9bc0f57676
Auto-generated-cl: translation import
 2014-12-01 09:24:52 -08:00
Jason Monk
0e2400fb16 SysUI: QS Wifi get connected wifi rssi from NC 
Get the connected rssi for WiFi QS panel from NetworkController to
ensure it matches the status bar/QS.

Bug: 18479823
Change-Id: I82ca0cc9169a91b4e0ae6f07008d48fdb7b820f0
 2014-12-01 12:19:10 -05:00
John Spurlock
23a99a3ab0 am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '21d68f4808db02aa3252ba5dec8b0220d053cab3':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 17:11:21 +00:00
John Spurlock
21d68f4808 Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 2014-12-01 17:06:14 +00:00
Ihab Awad
8199d6c3db am 6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev 
* commit '6cacf44e7ecfe50097adc99dab97c3fb9770a1af':
  Telecom API updates (1/6)
 2014-12-01 16:29:35 +00:00