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

151578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
fe509f64a3 am 82f0d91a: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit '82f0d91ae27511f586fc7fb02e660e25e3efd3f8':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-12 10:47:25 +00:00
Przemyslaw Szczepaniak
5088188aa3 am def1eade: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit 'def1eade10caeb9f8f05ddbd63bec4621376b727':
  Replace TreeSet with HashSet.
 2014-09-12 10:47:21 +00:00
George Mount
b04e9038a3 am 6d0417db: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '6d0417db1341be9256a6bda483faf074200b6b76':
  Omit appearing views that have a parent that is also appearing.
 2014-09-12 10:47:16 +00:00
Julia Reynolds
cb71640edd am c82b401e: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'c82b401e6e02aba7fd83a354cab7da7614c9fff5':
  Allow device owners to update LOCATION_MODE.
 2014-09-12 10:47:12 +00:00
Yohei Yukawa
2ea10071b1 am 0fdbbb56: am 293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev 
* commit '0fdbbb568a204e7be9d6fd0889fe366ffd01ace0':
  Enrich test cases when enabling default IMEs part 3
 2014-09-12 10:47:07 +00:00
Baligh Uddin
f39952e88d am 837003f4: (-s ours) am 77522e51: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '837003f48aebb9dd96cb3101c754c6cdc871396b':
  Import translations. DO NOT MERGE
 2014-09-12 10:47:03 +00:00
Baligh Uddin
2c7db8dd9d am a5ebdc74: (-s ours) am efef3133: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a5ebdc744ab9a119a54eb20e5799e73b91e33060':
  Import translations. DO NOT MERGE
 2014-09-12 10:46:59 +00:00
Alexandra Gherghina
67fd90332e am 75aeed1c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit '75aeed1c77c21e28b2e3548132db0d6027152292':
  Remove package level intent forwarding.
 2014-09-12 10:46:55 +00:00
Yohei Yukawa
218502250e am e48df1a5: am 163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev 
* commit 'e48df1a5b8c0208661a0bd3adaee23e94db5be7f':
  Enrich test cases when enabling default IMEs part 2
 2014-09-12 10:46:51 +00:00
Paul Jensen
639f5bc4d3 am 765f98cc: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit '765f98cce1d64c8b710b13ef89e21fe24efb4b1e':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-12 10:46:47 +00:00
Paul Jensen
d0730c83c7 am 3d9eb022: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit '3d9eb022aea3d491212835443d4fbac80466b7f7':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-12 10:46:43 +00:00
Jorim Jaggi
cf5b3388a2 am 5148c772: am 840b03de: Merge "Don\'t use layers when fading between public/private layout" into lmp-dev 
* commit '5148c772ddfd64457fa36fa09b01da2116eec8b4':
  Don't use layers when fading between public/private layout
 2014-09-12 10:46:38 +00:00
Jorim Jaggi
afdee9169f am c0f4567f: am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev 
* commit 'c0f4567f4c7886505f50d6c5b0097877ec9fad8e':
  Fix inconsistent layout param in notification
 2014-09-12 10:46:33 +00:00
Selim Cinek
e8768a4a9a am baa3f815: am 2b304948: Merge "Fixed a crash when the more card or the dismissview was longpressed" into lmp-dev 
* commit 'baa3f8157a1d537d0a6e99cda4f74b8c6ea2708d':
  Fixed a crash when the more card or the dismissview was longpressed
 2014-09-12 10:46:28 +00:00
Selim Cinek
07e99b353a am a148f057: am 31ffc0d6: Merge "Fixed a bug where the drag down animation was behaving wrong" into lmp-dev 
* commit 'a148f057ef45a85313701945508736172e77f206':
  Fixed a bug where the drag down animation was behaving wrong
 2014-09-12 10:46:22 +00:00
Selim Cinek
7e1fa081ac am f71a1a16: am e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev 
* commit 'f71a1a16ad332d6c42b2cb11a92b58ba52d9a0e5':
  Fixed a bug where the notifications and the clock could jump
 2014-09-12 10:46:16 +00:00
Nicolas Prevot
103a6ead4e am 7e16a563: am db19c5af: Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev 
* commit '7e16a563a384cf6f39c56ba3960124b4f49d3af6':
  Fix: always allow getProviderMimeType within the same user.
 2014-09-12 10:46:11 +00:00
Yohei Yukawa
878ad3b37e am decf7f1e: am 92701395: Merge "Enrich test cases when enabling default IMEs" into lmp-dev 
* commit 'decf7f1e35e1b37904b61911eb087549614bd657':
  Enrich test cases when enabling default IMEs
 2014-09-12 10:46:05 +00:00
Derek Tan
d2a5a07acd am 3a230576: am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev 
* commit '3a230576266e75f3fd034d54dec1d85832be297b':
  Update the comment in two APIs since we will persist the settings.
 2014-09-12 10:45:59 +00:00
Deepanshu Gupta
300da343af am 2c3cfb90: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev 
* commit '2c3cfb9014ef5a970d9729073d1febfe7de4ee9e':
  LayoutLib: support font weights.
 2014-09-12 10:45:53 +00:00
Jean-Michel Trivi
00b7e2cdee am 930795c0: am a20c82b9: am e5c53e9d: am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver 
* commit '930795c0d247d25fe7a551248eecba986f449fa0':
  Do not restore the media button event receiver
 2014-09-12 10:45:48 +00:00
Ricardo Cervera
51d1cbba5c am 37dbbe0d: am bb79fcb8: am 6c7bc371: am 4232a59b: am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 
* commit '37dbbe0dd79c59cf86359b5f8603f2d5f5353e30':
  cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
 2014-09-12 10:45:42 +00:00
Ricardo Cervera
562ee2e7d1 am d7ba3364: am ce068304: am 4bb4d66c: am 02afa734: am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 
* commit 'd7ba3364845de06a02a7ec04616059a115f9495c':
  docs: Fixed minor bug in downloads class. Bug: 16948533
 2014-09-12 10:45:37 +00:00
Youngsang Cho
1e3c123bdd am 95f093cb: am 4608b9d9: Fix build breakage 
* commit '95f093cbc58a9a0219db95e1bd4bd18a6c45d94a':
  Fix build breakage
 2014-09-12 10:45:32 +00:00
Terry Heo
04d3079437 am 5b915753: am 75cd6c5e: Merge "Add a system API to query hdmi system audio mode" into lmp-dev 
* commit '5b9157534e4df82befa58f2eed00ecfcbd45cd10':
  Add a system API to query hdmi system audio mode
 2014-09-12 10:45:29 +00:00
Chulwoo Lee
b0e10c1e1c am 2e2422ec: am cacba761: Notify of the update of TvInputInfo 
* commit '2e2422ec812883c50de8153152a7f4ad6c3583db':
  Notify of the update of TvInputInfo
 2014-09-12 10:45:25 +00:00
Alan Viverette
f5e70b9882 am d834fa99: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit 'd834fa998c17b09e23af3bad796e3b1cc3168ada':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-12 10:45:21 +00:00
Svetoslav Ganov
8ae800b40d am 96ae7282: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit '96ae7282cb86dd1c7291840ab2575c5e740e5aff':
  Using the correct package name for ContentResolver
 2014-09-12 10:45:17 +00:00
Lajos Molnar
a188f8a14b am 4032fbdc: am c4c153a8: MediaCodec.Image: use image.setCrop() in constructor 
* commit '4032fbdc344cd1f64860a8c97462337bdcac2126':
  MediaCodec.Image: use image.setCrop() in constructor
 2014-09-12 10:45:14 +00:00
Dianne Hackborn
84ec18bd62 am bc3eadca: am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev 
* commit 'bc3eadca0e61ac17178a8e009ce9e038af5ef89e':
  Fix issue #17414533: update batterystats occasionally takes a couple...
 2014-09-12 10:45:10 +00:00
Dianne Hackborn
3908792fc8 am 26ed2b70: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit '26ed2b70de2acc2cae45a96f576b9125007de764':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-12 10:45:06 +00:00
Lajos Molnar
38358ccc51 am f0c11830: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit 'f0c1183002e8ad7fbea2f3c7d2189ebc5c862780':
  add android.util.SizeF.parseSizeF()
 2014-09-12 10:45:03 +00:00
Adam Lesinski
330d4df5f6 am 713a0555: am 5acd2166: Merge "Output recent configs in am get-config command" into lmp-dev 
* commit '713a0555def3b366d30d522741f7390f9a746361':
  Output recent configs in am get-config command
 2014-09-12 10:44:58 +00:00
Alan Viverette
b5fec2ce90 am 46751736: am 2a94c34d: Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev 
* commit '467517362593673580a6f63cdb09b38b6106a760':
  Copy opaque over shape in GradientDrawable copy constructor
 2014-09-12 10:44:55 +00:00
Alan Viverette
f2fc8dca03 am 74361162: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 
* commit '743611626e7d9325b38baef27a697f11876a2ff6':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
 2014-09-12 10:44:51 +00:00
Alan Viverette
86f92b9de4 am 70eb8e2e: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '70eb8e2e3052739263126fda059fe0d13271430c':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-12 10:44:47 +00:00
Alan Viverette
64798ac587 am 69d6f10f: am 38669745: Merge "Only force drawing in RippleDrawable when necessary" into lmp-dev 
* commit '69d6f10f1131756bb6afa1c52cfb083edd4d1a59':
  Only force drawing in RippleDrawable when necessary
 2014-09-12 10:44:43 +00:00
Chris Craik
a82280296a am f08fb156: am 093e3412: Merge "Additional layer logging" into lmp-dev 
* commit 'f08fb15646a29bebc5594966fbf8ba7f66dc8b8b':
  Additional layer logging
 2014-09-12 10:44:39 +00:00
Svetoslav
3038b68afb am 145a5654: am a6b5869f: Merge "Fix a crash in print spooler." into lmp-dev 
* commit '145a56543f5aecaf492ad63f6235789388fae7e6':
  Fix a crash in print spooler.
 2014-09-12 10:44:36 +00:00
Svetoslav
01842d0f1b am b2347d2d: am 930f4fe4: Merge "Accessibilty support for the print UI." into lmp-dev 
* commit 'b2347d2d14ccb00fcbd45de7c60e180619571a5a':
  Accessibilty support for the print UI.
 2014-09-12 10:44:32 +00:00
Jeff Sharkey
3ee0b2494c am a4368b37: am bed348e3: Merge "Manage mode shouldn\'t block for other providers." into lmp-dev 
* commit 'a4368b377ae2ec78a779d6ae46929dab4c00b0bf':
  Manage mode shouldn't block for other providers.
 2014-09-12 10:44:28 +00:00
Eric Laurent
d93e2d623f am c97f1d02: am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev 
* commit 'c97f1d02ee728267e7b452021032d3e6d44fec9b':
  AudioEffect JNI: fix queryEffects()
 2014-09-12 10:44:24 +00:00
Baligh Uddin
9449525e87 am 6cd00e14: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '6cd00e14b27702750f4d28267f932c892db2613d':
  Import translations. DO NOT MERGE
 2014-09-12 10:44:21 +00:00
Baligh Uddin
711f047920 am 75794bdc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '75794bdc18439b03b09436f0945507421b86c12c':
  Import translations. DO NOT MERGE
 2014-09-12 10:44:17 +00:00
Esteban Talavera
d09fbafa92 Merge "Add new adb dpm (= DevicePolicyManager) command" into lmp-dev 2014-09-12 10:35:44 +00:00
Esteban Talavera
b5ef162129 Add new adb dpm (= DevicePolicyManager) command 
Adds new adb command to execute DevicePolicyManager tasks. First subcommand
allows us to set a device owner on a provisioned device (provided no accounts
are associated with the device). This is required as GTS tests run on provisioned
devices. We plan to add more subcomands required for new GTS tests, such as the
ability to create a managed profile.

Bug: 17312478, 17316711
Change-Id: I2613178ea82a6c6268e7f8012e74c4a852fea0d4
 2014-09-12 11:33:59 +01:00
Zoltan Szatmary-Ban
11f72c0d97 Merge "Leave SettingsProvider running if cloning of a setting fails" into lmp-dev 2014-09-12 10:15:10 +00:00
Jessica Hummel
d4aaab99bb Merge "Use correct string for provisioning complete action." into lmp-dev 2014-09-12 10:02:47 +00:00
Jessica Hummel
5669216e0d Use correct string for provisioning complete action. 
Change-Id: If7e0ca78a89f2cf4853ce01eb14e8a2913e3f85d
bug: 17390600
 2014-09-12 09:27:30 +00:00
Jinsuk Kim
3b9309a01c CEC: Stub MHL Device 
Replaced HdmiMhlLocalDevice with stub implementation,
and removed other MHL classes.

Bug: 17479050

Change-Id: I08880b0703eb4a94ae5e8aa973886a15f8160a38
 2014-09-12 17:30:32 +09:00