Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
c8a48293fc am 588d8e46: am 17e0a7e7: am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '588d8e46df26631567413c1cb6df3883a49d31c9':
  Fix projection permission dialog layering
 2014-12-01 19:38:17 +00:00
Geoff Mendal
84346fe072 am bcfc5254: (-s ours) am de3f61f4: (-s ours) am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit 'bcfc52540692fa11dfc8fb0fe394eafec21cf2f2':
  Import translations. DO NOT MERGE
 2014-12-01 19:38:13 +00:00
Scott Main
b75f22cab3 am 46f0ffa9: am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '46f0ffa99b623b436e56a467d0ba533c6c903b40':
  docs:advmgr-updates
 2014-12-01 19:38:08 +00:00
smain@google.com
17d14a2e30 am 183d9e4a: am b8de593e: am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit '183d9e4a756f0045881288e51b40002a99b5c1b0':
  define height for context images to avoid content jumps on load
 2014-12-01 19:38:03 +00:00
Narayan Kamath
d198c3269a am 53651b99: am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '53651b9982f53236b767d766e85ec0ce3acc6f0f':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:37:59 +00:00
Amit Mahajan
cf45709e5c am 719638af: am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit '719638afea79a3cee77fc75c4c54d36de2ca44a5':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:37:54 +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
Adrian Roos
588d8e46df am 17e0a7e7: am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '17e0a7e7ac289deacff01c84591dae4009f86415':
  Fix projection permission dialog layering
 2014-12-01 19:33:21 +00:00
Geoff Mendal
bcfc525406 am de3f61f4: (-s ours) am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit 'de3f61f46616ed42c03fc8f171324e011ddbcc5d':
  Import translations. DO NOT MERGE
 2014-12-01 19:32:36 +00:00
Scott Main
46f0ffa99b am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit 'cd79f9f0f4a3fb3527023450839313aa67e5e106':
  docs:advmgr-updates
 2014-12-01 19:32:31 +00:00
smain@google.com
183d9e4a75 am b8de593e: am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit 'b8de593ec2ca04009835960357c59feff28af551':
  define height for context images to avoid content jumps on load
 2014-12-01 19:32:25 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +00:00
Amit Mahajan
719638afea am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-12-01 19:32:06 +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
Stuart Scott
7151cde3ca Subscription Info density-dependent text size and localized SIM slot index 
Change-Id: I49fed470ea82c91ff7d77df2c3447b17a203a38d
 2014-12-01 11:14:53 -08: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
1c9038f260 Merge "Import translations. DO NOT MERGE" 2014-12-01 19:00:46 +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
Geoff Mendal
b0897eb86c Import translations. DO NOT MERGE 
Change-Id: Ia48c68c5546c75b83c937586e3d32f8ee6696ef1
Auto-generated-cl: translation import
 2014-12-01 10:50:12 -08: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 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
Craig Mautner
683f37db5c am 1764465d: am b5981aa8: am ee7c30e1: Merge "Avoid capture all black screenshot bitmap" 
* commit '1764465d81ad194d00bab372d2bfa031d75d641a':
  Avoid capture all black screenshot bitmap
 2014-12-01 16:54:45 +00:00
Craig Mautner
1764465d81 am b5981aa8: am ee7c30e1: Merge "Avoid capture all black screenshot bitmap" 
* commit 'b5981aa8d18dbd952ff74a75f962d4ec98f38807':
  Avoid capture all black screenshot bitmap
 2014-12-01 16:49:34 +00:00
Craig Mautner
b5981aa8d1 am ee7c30e1: Merge "Avoid capture all black screenshot bitmap" 
* commit 'ee7c30e1f9a40b6498f7aa374e71bb0bfc6482a3':
  Avoid capture all black screenshot bitmap
 2014-12-01 16:44:24 +00:00
Geoff Mendal
c5bbe99248 Merge "Import translations. DO NOT MERGE" 2014-12-01 16:44:24 +00:00
Craig Mautner
ee7c30e1f9 Merge "Avoid capture all black screenshot bitmap" 2014-12-01 16:38:14 +00:00