Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,799 Commits 3 Branches 0 Tags
adecb3f832b2142316bb19d1849448d0101ef335
Commit Graph

44251 Commits

Author SHA1 Message Date
Raph Levien
adecb3f832 am 67d8925f: am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '67d8925ff3e866e35f7bb5345355100ec6b70300':
  Ensure layout in getExtendedPadding calls
 2014-09-03 09:13:24 +00:00
Raph Levien
82ea4ee7f4 am 83f28d57: am 2e97ac0c: Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 
* commit '83f28d5710b9ffca5ab8876e12458a515e694645':
  Ensure layout in getExtendedPadding calls
 2014-09-03 05:48:48 +00:00
Raph Levien
4c5ea10caf Merge "Ensure layout in getExtendedPadding calls" into lmp-dev 2014-09-02 21:53:26 +00:00
Raph Levien
463cf1aea8 Ensure layout in getExtendedPadding calls 
There are cases in which getExtendedPaddingTop() and Bottom can get
called even without a valid layout. This patch just makes sure there
is some reasonable layout available.

Fix for bug 14819392 "java.lang.NullPointerException in
android.widget.TextView"

Change-Id: I203899402ddfe857a688b16b7855a8991eee82b7
 2014-09-02 14:23:18 -07:00
Paul Lawrence
28bebdc2a2 am cf2895ec: am 60a85de8: am 4fdbcb33: Add constants so we can distinguish decryption failures 
* commit 'cf2895ece9b80c36fe7d279777ea4a869f9bf2df':
  Add constants so we can distinguish decryption failures
 2014-09-02 19:14:23 +00:00
Paul Lawrence
39d8aab585 am 60a85de8: am 4fdbcb33: Add constants so we can distinguish decryption failures 
* commit '60a85de8b99de43df5ea3de36d45831e2bdffe49':
  Add constants so we can distinguish decryption failures
 2014-09-02 18:55:52 +00:00
Michael Wright
2993c30a33 am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 
* commit 'ac0f5a4616dab78a4216d826219379a663cc1139':
  VirtualDisplay.Callbacks -> Callback
 2014-09-02 18:36:06 +00:00
Jean-Michel Trivi
b129930398 am dbb72302: am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 
* commit 'dbb723022367174662a49aa4080286d454e2e0e4':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
 2014-09-02 18:36:01 +00:00
Paul Lawrence
e2c88d39b2 Add constants so we can distinguish decryption failures 
Bug: 17213613
Change-Id: I6bc10a1ed0855f6946ea9eb2f8d2db00c1af327c
 2014-09-02 18:26:32 +00:00
Michael Wright
01fd39a09d am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 
* commit '6e0bd93a2b7fc338c3ba64995cba309cd51035b6':
  VirtualDisplay.Callbacks -> Callback
 2014-09-02 18:21:50 +00:00
Jean-Michel Trivi
8adc5b68ad am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 
* commit '26f51de01c45e86c340efd783ea577719850be4a':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
 2014-09-02 18:21:45 +00:00
Tyler Gunn
392f24dc8d am 51023e0e: am a8c7d1bc: am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 
* commit '51023e0e394d33773a4dd4650190fd1b41131303':
  Remove "ask each time" SIP call setting. (1/2)
 2014-09-02 18:12:29 +00:00
Dianne Hackborn
43f75b4db1 am 347a8167: am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '347a81674350d3848e513f678cbf689074b935fd':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 18:12:20 +00:00
Ronghua Wu
98f883f8de am 50ac3f3c: am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 
* commit '50ac3f3c994e9a825f6f84445ce44ce8b4451c20':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
 2014-09-02 18:02:52 +00:00
Amith Yamasani
06ee49b935 am 4f7681af: am e681727f: am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev 
* commit '4f7681afaf074096510261fa9f29ca9757d0605d':
  Make it possible to remove current user
 2014-09-02 18:02:42 +00:00
Tyler Gunn
c855fa5991 am a8c7d1bc: am 78c0d4ab: Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 
* commit 'a8c7d1bcf5de323a8a5b8e3fff0c7759be06118e':
  Remove "ask each time" SIP call setting. (1/2)
 2014-09-02 18:00:00 +00:00
Dianne Hackborn
86f0c17e4b am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '4e784a505cb76e00e88dcf00c7b41b6ff0417964':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 17:59:55 +00:00
Michael Wright
02aa75a083 Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 2014-09-02 17:54:45 +00:00
Jean-Michel Trivi
5f4cfd3ab7 Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 2014-09-02 17:52:46 +00:00
George Mount
a46457597a am e4ff5cd7: am 8e95e5f7: am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 
* commit 'e4ff5cd75e38f8e76ea2a1b9a77e492df0a7c865':
  Update window always on convertTo/FromTranslucent
 2014-09-02 17:45:17 +00:00
Ronghua Wu
ea34edbee6 am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 
* commit 'eaa9befb1e981d58a8e4d248c88d4fe204d06ea9':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
 2014-09-02 17:43:10 +00:00
Amith Yamasani
4f34c86f3c am e681727f: am 9bdf3963: Merge "Make it possible to remove current user" into lmp-dev 
* commit 'e681727f0106b67824e6315e5473232b42f54120':
  Make it possible to remove current user
 2014-09-02 17:42:54 +00:00
Adrian Roos
795bda10d8 am 8cfa6c56: am 0910b0b7: am 5e287457: Merge "Trust: Look at the security unlock method of the right user" into lmp-dev 
* commit '8cfa6c56c8217af1905c1659cd443c321650afcc':
  Trust: Look at the security unlock method of the right user
 2014-09-02 17:39:44 +00:00
Christoph Studer
5da33dd794 am 496e72ca: am b95181ac: am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev 
* commit '496e72cac5103edd1ccd56a95741ec664fe9cae3':
  Notification: Reset view params for re-use
 2014-09-02 17:39:24 +00:00
Jorim Jaggi
db1600aeec am c2ce51ee: am db68bb49: am faecb0b4: Merge "Media notification updates" into lmp-dev 
* commit 'c2ce51eea33d81728420724bb6bd7bdd0f85c63a':
  Media notification updates
 2014-09-02 17:38:53 +00:00
Yohei Yukawa
cc5c2e110b am 4a4a566f: am ee4f6579: am 08e56027: Merge "Get rid of one redundant comparison of #mComposingTextStart" into lmp-dev 
* commit '4a4a566f0d9f81cb9341da19a00839ce5ff728a9':
  Get rid of one redundant comparison of #mComposingTextStart
 2014-09-02 17:38:33 +00:00
George Mount
6c07bacd64 am 571f1373: am ae570491: am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 
* commit '571f1373244f2ca21345744a5029154ec536fc9d':
  Fix NPE in EnterTransitionCoordinator.
 2014-09-02 17:34:47 +00:00
George Mount
fe6acd9606 am 00b92bc9: am f055be2d: am 8ee63e6c: Merge "Use optimized Keyframes for Path animations." into lmp-dev 
* commit '00b92bc94c1319a0e2e7ee484fb64d68dbfab3fa':
  Use optimized Keyframes for Path animations.
 2014-09-02 17:34:42 +00:00
Ruben Brunk
fd3c235720 am 67b7f03c: am 25e44765: am ea33afcb: Merge "camera2: Add HDR vendor tag for legacy mode." into lmp-dev 
* commit '67b7f03ca315ef4666c7db5ef9bb72031b7ffac8':
  camera2: Add HDR vendor tag for legacy mode.
 2014-09-02 17:33:28 +00:00
Tyler Gunn
4b7498d81f Merge "Remove "ask each time" SIP call setting. (1/2)" into lmp-dev 2014-09-02 17:31:39 +00:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26 Hide the interaction part of VoiceInteractionService. 
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.

Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
 2014-09-02 10:29:28 -07:00
Ronghua Wu
a7118c9bb2 Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 2014-09-02 17:27:26 +00:00
Amith Yamasani
2cdcc7d360 Merge "Make it possible to remove current user" into lmp-dev 2014-09-02 17:21:58 +00:00
George Mount
94d23608eb am 8e95e5f7: am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 
* commit '8e95e5f75073aa7a43fba25ae9fc257ddc6159e6':
  Update window always on convertTo/FromTranslucent
 2014-09-02 16:38:18 +00:00
George Mount
b4558e7e5f Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 2014-09-02 16:20:06 +00:00
Tyler Gunn
2c830a2905 Remove "ask each time" SIP call setting. (1/2) 
1. Removed setting from Settings.System class.
2. Added settings database migration step to change "SIP_ASK_ME_EACH_TIME"
to "SIP_ADDRESS_ONLY" as the "ask me each time" option no longer makes
sense given the new phone accounts settings.

Bug: 17321422
Change-Id: I3df1be4fcda44f2097c49af44508ac1fce72a24b
 2014-09-02 08:39:35 -07:00
dcashman
a3fc37688e am 81e03816: am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit '81e038162935b00ccb2f6c76be4c3f633a8a1cb5':
  Address KeySet API Review
 2014-09-02 07:11:27 +00:00
Robin Lee
4121ec6aa1 am 714e80be: am 066b8593: am cf5d78fb: Merge "Keep managed profile keystores in sync with owner" into lmp-dev 
* commit '714e80be6a51c0156cd63ef6abd347f33b6cc161':
  Keep managed profile keystores in sync with owner
 2014-09-02 07:11:22 +00:00
George Mount
c191226323 am 76a1df69: am 8383fba1: am 2ad5c527: Merge "Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds." into lmp-dev 
* commit '76a1df698b0005f8b85e81bdae159e1647e9c8c5':
  Use offsetLeftAndRight and offsetTopAndBottom in ChangeBounds.
 2014-09-02 07:11:02 +00:00
Dianne Hackborn
9ab7f26183 am abb2e104: am d0780328: am 325662a3: Merge "Oh sticky broadcasts, I\'d like to do even worse to you." into lmp-dev 
* commit 'abb2e104319552d2fd98d94fbd089f9ebdbbfe2d':
  Oh sticky broadcasts, I'd like to do even worse to you.
 2014-09-02 07:10:51 +00:00
John Spurlock
4494da981b am 22c0f356: am ec6c1a68: am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev 
* commit '22c0f356f8793d44f9613cd5224d771e0c419442':
  Add a hidden system method to check call filter.
 2014-09-02 07:10:46 +00:00
Amith Yamasani
af039dfa78 am 4c1054a8: am b9970b0f: am 9d375df7: Merge "Clean up apks installed for a removed user" into lmp-dev 
* commit '4c1054a81b22843dcd36497347dd4ce637b24022':
  Clean up apks installed for a removed user
 2014-09-02 07:10:36 +00:00
Michael Wright
e4717e4378 am 467e25f1: am a4e2b977: am 224c2ccc: Merge "Use a linear spline if there\'s a non-monotonic brightness curve" into lmp-dev 
* commit '467e25f1ae0164012793bde9475e7b2be1a0472f':
  Use a linear spline if there's a non-monotonic brightness curve
 2014-09-02 07:10:26 +00:00
Chris Wren
d6c6cd80f0 am 7c528397: am a69ad7a3: am 7d0a2a7f: Merge "Disable lockscreen notifications for secure users on upgrade." into lmp-dev 
* commit '7c528397b54ca5b6cb865e7ba37754f3a831830c':
  Disable lockscreen notifications for secure users on upgrade.
 2014-09-02 07:09:56 +00:00
Michael Wright
75ee9fcde4 VirtualDisplay.Callbacks -> Callback 
Also, rename methods to be onPaused instead of onDisplayPaused, etc.

Bug: 17008630
Change-Id: Id9ead22a42d36ac338309f0f021ba341ed991144
 2014-09-01 23:49:57 -07:00
Adrian Roos
e647a9a5fe am 0910b0b7: am 5e287457: Merge "Trust: Look at the security unlock method of the right user" into lmp-dev 
* commit '0910b0b7229db8a826b8fc9d3a57a4dc40ded1c8':
  Trust: Look at the security unlock method of the right user
 2014-09-01 21:37:24 +00:00
Adrian Roos
ab84dba863 Merge "Trust: Look at the security unlock method of the right user" into lmp-dev 2014-09-01 21:13:12 +00:00
Adrian Roos
1572ee379e Trust: Look at the security unlock method of the right user 
Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7.

Bug: 17107213
Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47
 2014-09-01 23:03:28 +02:00
Christoph Studer
d7263993e4 am b95181ac: am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev 
* commit 'b95181ac8db47d735f50cb0be04cf2330756ecf5':
  Notification: Reset view params for re-use
 2014-09-01 19:51:33 +00:00