summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge "Fix a crash in RemoteViews." into lmp-devSvetoslav2014-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix a crash in RemoteViews.Svetoslav2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are now using the application info of the target app of the remote views to create a deicated context for loading resources. The code that is looking up the app info was using the appilcation context of the current app which may be null. Now we are using the base context which is never null. bug:17005860 Change-Id: Ibcf8b6f81fe24d23a82327870741146c8864ce8f
* | | | | | | | | | | | | | | | | Merge "Fixing bounds check." into lmp-devSunny Goyal2014-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixing bounds check.Sunny Goyal2014-08-181-1/+1
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie17b173ef88288076a5cbfdc741b8e105dcda03e
* | | | | | | | | | | | | | | | Merge "Fix alert, date picker, time picker dialogs for TV." into lmp-devCraig Stout2014-08-167-129/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix alert, date picker, time picker dialogs for TV.Craig Stout2014-08-157-129/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/15194230 Change-Id: I85bcef86332acb041e5c3b1f8c515d981486c3d1
* | | | | | | | | | | | | | | | | am f960409f: am 72ca94ee: am d0842384: docs: Updated links for Android ↵Ricardo Cervera2014-08-181-13/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Studio 0.8.6 * commit 'f960409f3b361df492ea7a9a48aefe89d5992572': docs: Updated links for Android Studio 0.8.6
| * | | | | | | | | | | | | | | | am 72ca94ee: am d0842384: docs: Updated links for Android Studio 0.8.6Ricardo Cervera2014-08-181-13/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72ca94ee29c71541b7628c44f44ef5cddff9a6e9': docs: Updated links for Android Studio 0.8.6
| | * | | | | | | | | | | | | | | am d0842384: docs: Updated links for Android Studio 0.8.6Ricardo Cervera2014-08-181-13/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd0842384cb9d6a19f129434457c88de64f2b0b06': docs: Updated links for Android Studio 0.8.6
| | | * | | | | | | | | | | | | | docs: Updated links for Android Studio 0.8.6Ricardo Cervera2014-08-181-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic01263930b94232445704c03854414bd07ca4c33
* | | | | | | | | | | | | | | | | Merge branch 'lmp-dev' of ↵Lenka Trochtova2014-08-182-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make AudioState constructors public" into lmp-devSailesh Nepal2014-08-162-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Make AudioState constructors publicSailesh Nepal2014-08-172-2/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for unit tests. Bug: 17073934 Change-Id: I04659faa54ba03247519237450b0a26f66958e8c
* | | | | | | | | | | | | | | | | am da9baa15: am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi ↵Deepanshu Gupta2014-08-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and battery icon for KK * commit 'da9baa15bf780d4e8924adbed3d8863c75da5e6c': Layoutlib: Update wifi and battery icon for KK
| * | | | | | | | | | | | | | | | am d519f742: am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery ↵Deepanshu Gupta2014-08-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icon for KK * commit 'd519f7424fd2faad371e7678b3dc11114fa5222f': Layoutlib: Update wifi and battery icon for KK
| | * | | | | | | | | | | | | | | am b6c923a2: am 59eedf52: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6c923a2dfd86eb56a8f83d5a27f21996331e436': Layoutlib: Update wifi and battery icon for KK
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 59eedf52: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59eedf528ca29a32b6d7f358f5076929f8fbb164': Layoutlib: Update wifi and battery icon for KK
| | | | * | | | | | | | | | | | | | | Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1512-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
* | | | | | | | | | | | | | | | | | | am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-186-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | * commit 'a4ceb9e64cd1ee6302e41c7799ebb6610af96d0e': Layoutlib: Update wifi and battery icon for KK
| * | | | | | | | | | | | | | | | | am 32faabbe: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '32faabbe14252397b35516caa9c0d0245bfcc719': Layoutlib: Update wifi and battery icon for KK
| | * | | | | | | | | | | | | | | | Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400 (cherry picked from commit 59eedf528ca29a32b6d7f358f5076929f8fbb164)
* | | | | | | | | | | | | | | | | | Update conference call APIs.Santos Cordon2014-08-1811-137/+680
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up conference call APIs to use a distinct type separate from Connection. Also allow the addition of Conference calls at any point using addConference() API method. Bug:16844332 Bug:16449372 Change-Id: I34e45fde1aa43559f5f4e29b990929c188b16875
* | | | | | | | | | | | | | | | | | Merge "Disable immersive mode confirmation for test automation" into lmp-devGuang Zhu2014-08-161-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Disable immersive mode confirmation for test automationGuang Zhu2014-08-171-2/+4
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PolicyControl#disableImmersiveConfirmation to return true as long as test harness flag is set. Test harness flag is read via ro.test_harness, and can only be set to true on builds with root access Change-Id: I5c2d56e8ea4d5a2972ab42e9a98eb2fce52b11ee
* | | | | | | | | | | | | | | | | Merge "Revert "Remove the warning if the caller gets the insecure variant ↵Kenny Root2014-08-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and add hostname verification (SNI)"" into lmp-dev
| * | | | | | | | | | | | | | | | | Revert "Remove the warning if the caller gets the insecure variant and add ↵Kenny Root2014-08-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hostname verification (SNI)" This reverts commit 007392a8a17df8b608f4ccd9129436cb570090d3. Bug: 16660566
* | | | | | | | | | | | | | | | | | Merge "Work on issue #16629489: Google (Play?) Services eating through ↵Dianne Hackborn2014-08-165-145/+311
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | battery" into lmp-dev
| * | | | | | | | | | | | | | | | | | Work on issue #16629489: Google (Play?) Services eating through batteryDianne Hackborn2014-08-175-145/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in how we deal with name overflows combined with resetting the battery stats data. If we do a reset while a wakelock is being actively held that has been put into the overflow bucket, then we can end up reducing the number of known wake locks in the list so when after that it is released we try to release it under its real name rather than the overflow name. This means we need to keep track of which wake locks have been placed in the overflow bucket while they are actively being used, so we can be sure to properly handle it as part of that bucket until it is eventually released. This makes things... somewhat more complicated. So now we have a class to take care of all these details, and also use it for other places where we have the same overflow semantics sync and job stats. Also fix potential deadlock -- BatteryStatsHelper needs to call on to ConnectivityManager to find out of there is telepohny, however we use that class when doing a dump while the battery stats lock is held. To fix this, we check the connectivity state up in the battery stats service before acquiring the lock and propagate that information through to the dump code. Change-Id: Ib452206af5c36f4b0f03cc94d2845d36613d1ba5
* | | | | | | | | | | | | | | | | | | Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" ↵Dianne Hackborn2014-08-164-27/+268
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | | | | | | | | | | | | Fix issue #17082301: replacePreferredActivity is ignoring userIdDianne Hackborn2014-08-164-27/+268
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was being given the argument and just... ignoring it. But the bulk of this change is to make replacePreferredActivity better about replacing -- it now detects if the request will not make a change and, in that case, just do nothing. The reason for this? It turns out that each time you install an app, the telephony system is calling this function over 20 times to set the default SMS app. This is almost always doing nothing, but before this change it means we would re-write packages.xml over 20 times...! There are definitely more improvements that can be made here (delaying write of packages.xml to allow them to batch together, reducing the amount of calls being made), but until then this is a big improvement. Change-Id: I02c4235b8ecd5c13ef53e65d13c7dc2223719cec
* | | | | | | | | | | | | | | | | | Play "device trusted" sound when onTrustInitiatedByUser firesAdrian Roos2014-08-1822-9/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16840500 Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
* | | | | | | | | | | | | | | | | | Merge "Don't mangle layer paint's alpha" into lmp-devJohn Reck2014-08-162-12/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Don't mangle layer paint's alphaJohn Reck2014-08-182-12/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15918037 Change-Id: Iecca0908c6e3b77f15807f75a8294d34975533b4
* | | | | | | | | | | | | | | | | | Fix bars jumping to black on activity launchAdrian Roos2014-08-181-0/+6
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During animations, the wallpaper crop is the union of the start and end crop. This prevents the system bars from jumping to black when an activity with opaque bars is launched. Bug: 16441036 Change-Id: Ic0f3bc2e83b9830514a3456a27ae6f23716f3240
* | | | | | | | | | | | | | | | | Merge "Fixes to lock task API from API review" into lmp-devJason Monk2014-08-165-60/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixes to lock task API from API reviewJason Monk2014-08-145-60/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding ComponentNames and some splitting/renaming of broadcasts. Bug: 17005622 Change-Id: I9ece3553310fb20b0c3c3e4032b408e86384363a
* | | | | | | | | | | | | | | | | Merge "QS: Add scanning progress state indication." into lmp-devJohn Spurlock2014-08-166-4/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | QS: Add scanning progress state indication.John Spurlock2014-08-166-4/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create a modified version of the new platform horizontal indeterminate progress indicator, and align it to the bottom of the header. - Ensure the scanning state takes the active detail panel into account. Bug:16145178 Change-Id: I7f80c458ff6565aa00085da9059a4e9fe7e49233
* | | | | | | | | | | | | | | | | Merge "CEC: Handle Remote Control command" into lmp-devTerry Heo2014-08-163-0/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | CEC: Handle Remote Control commandTerry Heo2014-08-183-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate an Android key event when a UserControl message is received. And report menu state active when a MenuRequest message is received to notify sender can send a UserControl message. Bug: 16938007 Change-Id: Id8f393dc254508b9e7a6fa203f8e817fbe807e38
* | | | | | | | | | | | | | | | | | Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-devChulwoo Lee2014-08-161-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix ConcurrentModificationException in PersistentDataStoreChulwoo Lee2014-08-171-8/+14
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17092853 Change-Id: I613c90b5b78ce317996edb2fda1703aaa318fb1e
* | | | | | | | | | | | | | | | | | Implement MHL send key action.Jungshik Jang2014-08-183-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class introduces two classes, MhlSendKeyAction and HdmiMhlKeycode. - MhlSendKeyAction is a feature action that manages MHL message for RCP, Remote Control Pass Through. - HdmiMhlKeycode is a collection of MHL keycode including keycode mapping between MHL and Android keycode. Bug: 16966459 Change-Id: Ib3f7229c71b66837cd0d239e5af1940dfccee7df
* | | | | | | | | | | | | | | | | | Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" ↵Jinsuk Kim2014-08-1610-76/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | | | | | | | | | | | | CEC: Replace the usage of logical address with id for HdmiDeviceInfoJinsuk Kim2014-08-1410-76/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced 'id' of HdmiDeviceInfo to replace the direct use of logical address as id. This accomodates the identification of MHL device with ease. Also updated TIF to use id instead of logical address. Bug: 16986744 Change-Id: Ifa827fb5e5fcf1d2f612f0845accbfe5c03734aa
* | | | | | | | | | | | | | | | | | | Merge "Remove MediaProjection#createAudioRecord API" into lmp-devMichael Wright2014-08-162-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove MediaProjection#createAudioRecord APIMichael Wright2014-08-172-1/+1
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
* | | | | | | | | | | | | | | | | | | Merge "Change 'disable hardware keyboard' to 'show input method'" into lmp-devMichael Wright2014-08-1611-83/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Change 'disable hardware keyboard' to 'show input method'Michael Wright2014-08-1711-83/+34
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it implied that the hardware keyboard would be disabled, but really the toggle would just enable showing the IME even if a hardware keyboard was present. Changed the string and swapped the semantics to be more clear about the behavior. Bug: 14066881 Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
* | | | | | | | | | | | | | | | | | Add tcp buffer size conduit to NetworkAgent.Robert Greenwalt2014-08-172-58/+85
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 16549611 Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591