Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,258 Commits 3 Branches 0 Tags
1fd78e9268a5c884cfcfec2133b62a11a74dbc00
Commit Graph

160258 Commits

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

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
Ihab Awad
6cacf44e7e Merge "Telecom API updates (1/6)" into lmp-mr1-dev 2014-12-01 16:24:18 +00:00
Chet Haase
8394e9fff3 am 21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 
* commit '2187144408dbdb5322a2212fa2e68a5891ea60ca':
  Zero duration animations snap to end value when started
 2014-12-01 15:58:46 +00:00
Chet Haase
2187144408 Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev 2014-12-01 15:52:59 +00:00
Geoff Mendal
9e8637411a am 3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3fbf3b939abbc681f6812a429e2b809358deb7c3':
  Import translations. DO NOT MERGE
 2014-12-01 15:11:25 +00:00
Geoff Mendal
11fe2dfd32 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-01 15:10:36 +00:00
Geoff Mendal
7a2b09165b Import translations. DO NOT MERGE 
Change-Id: Ic5278b3f5da079c97f9aafd947fef96ae3248778
Auto-generated-cl: translation import
 2014-12-01 07:09:47 -08:00
Geoff Mendal
3fbf3b939a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-01 15:07:56 +00:00
John Spurlock
64e034e351 am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit 'e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 15:04:02 +00:00
John Spurlock
c1e4d1554f am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 
* commit '1a3af711ab6f811a6bc4e9211cb255721fb1847d':
  Doze: Break out proxcheck stats by pulse reason.
 2014-12-01 15:03:57 +00:00
John Spurlock
fdc07dce37 am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev 
* commit '26a695d974f7ee3b32b8d65a44a42f804af8f01c':
  Volume: Update remote volume icons.
 2014-12-01 15:03:52 +00:00
Geoff Mendal
616a8e9438 Import translations. DO NOT MERGE 
Change-Id: I1475c76eb44b69ef727a11f409e7d938552ee26d
Auto-generated-cl: translation import
 2014-12-01 07:02:48 -08:00