summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Always mix in additional entropy into keymaster.Alex Klyubin2015-05-063-10/+34
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes AndroidKeyStore Cipher and KeyGenerator implementations mix in additional entropy into keymaster's RNG regardless of whether they were provided with a SecureRandom instance. In practice, they are always provided with a SecureRandom instance. However, to be safe, when no SecureRandom instance is provided the code now uses a platform-default SecureRandom implementation. Bug: 18088752 Change-Id: I85bca30d7bdc82c2a342094dcbe6044e48a63dca
* | | | | | | | | | | | | | | | Merge "Filter list of possible default dialers" into mnc-devYorke Lee2015-05-071-5/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Filter list of possible default dialersYorke Lee2015-04-281-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure they handle the ACTION_DIAL intent with the tel scheme Bug: 20304411 Change-Id: I1822eff8bc014d4679352165ebe2bc819b82f75b
* | | | | | | | | | | | | | | | | Merge "Adjust the Javadoc for user authentication timeout." into mnc-devAlex Klyubin2015-05-074-16/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Adjust the Javadoc for user authentication timeout.Alex Klyubin2015-05-074-16/+20
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Javadoc incorrectly stated that: * 0 means authentication required for every use. * -1 means that timeout is not specified and the key can be any time. Bug: 18088752 Change-Id: Ie5f37e74dc207f23443527ac1725ae8a37213d75
* | | | | | | | | | | | | | | | | Merge "Define String constants for AndroidKeyStore crypto." into mnc-devAlex Klyubin2015-05-0715-397/+754
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Define String constants for AndroidKeyStore crypto.Alex Klyubin2015-05-0615-397/+754
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This defines the String enum values based on JCA standard names for key algorithm, block mode, padding schemes, and digests. This should make it safer to interact with AndroidKeyStore code that uses JCA strings. This was requested by API Council. Bug: 18088752 Change-Id: I241d9225a13b85479d0a84e49d0a98cbc77e5817
* | | | | | | | | | | | | | | | Merge "Make popup window enter animation more like app transition enter" ↵Alan Viverette2015-05-075-441/+341
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | | | | Make popup window enter animation more like app transition enterAlan Viverette2015-05-075-441/+341
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merges the translate and clip reveal so that we can adjust the clip position based on the current translate position. This ensures the clip appears to expand from the center of the translated popup and never extends outside the window bounds. Change-Id: I8bbb9c0e2293a25f7807d71d9b8779bb782d4784
* | | | | | | | | | | | | | | | | am b65b66cc: am 2224eac3: Merge "bootanimation: fix garbage line issue when ↵Chris Elliott2015-05-071-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen height is odd." into lmp-mr1-modular-dev * commit 'b65b66ccc251371c817abe75176a73f84565410e': bootanimation: fix garbage line issue when screen height is odd.
| * | | | | | | | | | | | | | | | am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height ↵Chris Elliott2015-05-071-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is odd." into lmp-mr1-modular-dev * commit '2224eac30375a731f4ad38d6930dbc37b0855a0d': bootanimation: fix garbage line issue when screen height is odd.
| | * | | | | | | | | | | | | | | Merge "bootanimation: fix garbage line issue when screen height is odd." ↵Chris Elliott2015-05-071-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-modular-dev
| | | * | | | | | | | | | | | | | | bootanimation: fix garbage line issue when screen height is odd.Chris Elliott2015-05-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:20032072 Change-Id: I784fb6f815b22c37dcd7354729aca346726196d9
* | | | | | | | | | | | | | | | | | Merge "Remove tools attributes from framework XML" into mnc-devAlan Viverette2015-05-073-59/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove tools attributes from framework XMLAlan Viverette2015-05-073-59/+15
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20494934 Change-Id: Iaf43abddf6b533c107350254e467e7a029ccc88d
* | | | | | | | | | | | | | | | | | Merge "Fix leak in LayoutTransition" into mnc-devChet Haase2015-05-071-16/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix leak in LayoutTransitionChet Haase2015-05-051-16/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, an OnPreDrawListener was added to clean things up, including removing the listener, after animations are started. But if the view is detached before that listener is called, the listener will remain on that ViewTreeObserver. This change adds an OnAttachStateChangeListener to perform that cleanup step when the view is detached, just in case. Issue #20824645 Leak in LayoutTransition Change-Id: I264812f8e02dda673789712ba83d208e87cdc5a4
* | | | | | | | | | | | | | | | | | Merge "Don't strip country and variant from locale." into mnc-devNiels Egberts2015-05-071-29/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Don't strip country and variant from locale.Niels Egberts2015-05-071-29/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the synthesizer returns LANG_AVAILABLE or LANG_COUNTRY_AVAILABLE for a certain locale, we strip the country and variant from the locale before asking the synthesizer for the default voice name for this locale. This can prevent the synthesizer from picking the right locale. For instance it prevents the synthesizer from picking en-gb if en-au is requested, now it can only have a single preferred voice for all English countries. The solution is not to strip the country and variant from the locale. This is not likely to break anything, because the input to onGetDefaultVoiceNameFor was never expected to be a subset of all supported language-country-variant combinations. The default implementation handles this correctly. Change-Id: I017f69d321039c7aa7a3ef5a09ba138e35b66670 (cherry picked from commit 4758e99783493fc546e6819b5fe9d44e1ef8c318)
* | | | | | | | | | | | | | | | | | Merge "Add warning if an in-use Bitmap is reconfigured" into mnc-devJohn Reck2015-05-077-28/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add warning if an in-use Bitmap is reconfiguredJohn Reck2015-05-067-28/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18928352 Also fix an issue around re-configure not properly handling mPinnedCount in android::Bitmap Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
* | | | | | | | | | | | | | | | | | | Merge "Avoid NPE when sendMessage is called after disconnect." into mnc-devPaul Jensen2015-05-071-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Avoid NPE when sendMessage is called after disconnect.Paul Jensen2015-05-071-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids an NPE that could occur when: 1. disconnect() is called 2. sendMessage() is called but encounters a RemoteException 3. replyDisconnected() will attempt to dereference mSrcHandler There does not appear to be any callers that rely on the NPE. All callers erase their reference to the AsyncChannel after calling disconnect(), except for NetworkAgentInfo which can cause ConnectivityService to crash. This fix addresses that. bug:20647016 Change-Id: I89864885dc3371941407a036b7b7647e0ec037b8
* | | | | | | | | | | | | | | | | | Merge "Add CallbackRegistry." into mnc-devGeorge Mount2015-05-072-0/+700
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add CallbackRegistry.George Mount2015-05-062-0/+700
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1a30a0ec8b1ece25046d85676432fb0b819f952
* | | | | | | | | | | | | | | | | | Merge "Fix crash during Activity Transition with TextureView." into mnc-devGeorge Mount2015-05-071-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix crash during Activity Transition with TextureView.George Mount2015-05-061-2/+1
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 20675857 GhostView was synchronously forcing the View's parent to get the display list when it was created. TextureView's cannot create a display list until a surface is available and will crash if it is attempted. This change moves the request to an invalidate to get it to execute at a later time. Change-Id: I12afebdfd57eb29c1a35b23a63d045e319547faf
* | | | | | | | | | | | | | | | | | Remove FloatMath methods from the APINeil Fuller2015-05-076-71/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removing FloatMathTest. The tests are being moved into a legacy CTS suite. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I397fd6bcc4d988db6301245f9d47460bd6c28821
* | | | | | | | | | | | | | | | | | Merge "Remove incomplete media router API." into mnc-devJeff Brown2015-05-075-412/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove incomplete media router API.Jeff Brown2015-05-065-412/+0
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time not also accidentally deleting frameworks/base/Android.mk. *sigh* Bug: 20641986 Change-Id: I2e43ab1fdf4201fec4d5a5b73c04f27a4a848630
* | | | | | | | | | | | | | | | | | Merge "CEC: Make wakeup on hotplug optional" into mnc-devJinsuk Kim2015-05-072-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | CEC: Make wakeup on hotplug optionalJinsuk Kim2015-05-072-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new system property to make the feature optional. True by default. Bug: 20897914 Change-Id: I8bfca5144b802b95361e63b29abd6371971c7dbb
* | | | | | | | | | | | | | | | | | | am b53420d0: am e7866887: docs: M Preview landing pageJoe Fernandez2015-05-077-7/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b53420d02def4277cf5b8a04da289b4291a9f24a': docs: M Preview landing page
| * | | | | | | | | | | | | | | | | | am e7866887: docs: M Preview landing pageJoe Fernandez2015-05-077-7/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e78668876ed0dfc25fac604b5048509f72d92c53': docs: M Preview landing page
| | * | | | | | | | | | | | | | | | | | docs: M Preview landing pageJoe Fernandez2015-05-067-7/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0e49713f105823898ca5f76d6d6eb4fad54df5e
* | | | | | | | | | | | | | | | | | | | Merge "Retry "Always show auxiliary subtypes from NavBar keyboard icon."" ↵Yohei Yukawa2015-05-077-15/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | | | | | | | | Retry "Always show auxiliary subtypes from NavBar keyboard icon."Seigo Nonaka2015-05-067-15/+70
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL relands I1e50ee42838a1bf64a612da4904aa93458d44ea4, which was reverted by I3decaf37198e5864a1763a059df4a36ebc70c5a7 due to the build breakage in 'layoutlib' target, with a proper fix. Hereafter the original CL description is repeated. The auxiliary subtypes should be listed if the input method picker is opened from NavBar keyboard icon. However there is only IMM#showInputMethodPicker() API to open input method picker and this is also used from LockScreen or Settings UI. Auxiliary subtypes should not be listed there(Id7cf5d122). Thus framework shows auxiliary subtypes based on IMMS#mInputShown and LockScreen state, but it is not a perfect solution. If a physical keyboard is connected, the soft input may be gone. As the result, auxiliary subtypes won't be listed even if it is opened from NavBar keyboard icon. To fix this issue, this CL introduces IMM#showInputMethodPicker(boolean) to be able to decide showing auxiliary subtypes by caller. Note that IMM#showInputMethodPicker(boolean) is still hidden with @hide. There is no public API change in this CL. Bug: 20763994 Change-Id: Id156c85535a221235737ea6dcc15a67f1c4b9f71
* | | | | | | | | | | | | | | | | | | | Bluetooth: Ensure Bluetooth interface handle is validNitin Arora2015-05-061-17/+12
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds null checks to Bluetooth interface handle to prevent using null references when BluetoothService is not up. Also removed the callbacks for the intermediate state removed for now as they are not being used. Change-Id: I0e72ff4da467a8bcf5a4e5ac48d8558e7f308c7e
* | | | | | | | | | | | | | | | | | | Merge "Revert "Remove incomplete media router API."" into mnc-devBart Sears2015-05-076-0/+1510
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Revert "Remove incomplete media router API."Bart Sears2015-05-076-0/+1510
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL has broken all builds on mnc-dev. Reverting until Jeff can take a look at it. This reverts commit 2e5a2051de54e64612e1357d4534c7ec851aa508. Change-Id: Ib9b3569bfebdc7bbfbcb7aee82733b93736c5bb5
* | | | | | | | | | | | | | | | | | | | am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to ↵Diego Perez2015-05-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | render a drawable in all available states" into lmp-mr1-dev * commit '0fe14486211e3ade7f29ea76e16211853fe9cd7a': Added function to render a drawable in all available states
| * | | | | | | | | | | | | | | | | | | am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a ↵Diego Perez2015-05-072-6/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable in all available states" into lmp-mr1-dev * commit '2021c8773150dd47d8781375af94143cb22afd9d': Added function to render a drawable in all available states
| | * | | | | | | | | | | | | | | | | | am 33e54563: am 4b125836: Merge "Added function to render a drawable in all ↵Diego Perez2015-05-072-6/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available states" into lmp-mr1-dev * commit '33e54563daa0db610f9dc8b9d4fca8f826ffec73': Added function to render a drawable in all available states
| | | * | | | | | | | | | | | | | | | | am 4b125836: Merge "Added function to render a drawable in all available ↵Diego Perez2015-05-072-6/+56
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | states" into lmp-mr1-dev * commit '4b12583653561f69a5780126485380cac187c478': Added function to render a drawable in all available states
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Added function to render a drawable in all available states" into ↵Diego Perez2015-05-072-6/+56
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | | * | | | | | | | | | | | | | | | | Added function to render a drawable in all available statesAndrew Shulaev2015-05-072-6/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730. Change-Id: I596855047d78c3c718744ad61432fc45e1239634 (cherry picked from commit 1f158819bc7cf58f97e47fabfaf23b2fb838f2eb)
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove incomplete media router API." into mnc-devJeff Brown2015-05-076-1510/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove incomplete media router API.Jeff Brown2015-05-066-1510/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20641986 Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
* | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Always show auxiliary subtypes from NavBar keyboard icon."" ↵Bart Sears2015-05-076-68/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | | | | | | | | | | Revert "Always show auxiliary subtypes from NavBar keyboard icon."Bart Sears2015-05-076-68/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CL is breaking the build. Discussed with Seigo and verting until he can take a look at it. This reverts commit 80ff4ed6bb8dbdad7192d679a01096aa888e090b. Change-Id: I3decaf37198e5864a1763a059df4a36ebc70c5a7
generated by cgit v1.1 at 2025-02-15 15:47:47 +0000