summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "TIF: Always flush pending app-private commands when resetting TvView" ↵Jae Seo2015-06-211-12/+7
|\ | | | | | | into mnc-dev
| * TIF: Always flush pending app-private commands when resetting TvViewJae Seo2015-06-201-12/+7
| | | | | | | | | | Bug: 19809952 Change-Id: Ic676b81591def065d79ac45cb1d247b67178e50b
* | Merge "TIF: Fix a typo" into mnc-devJae Seo2015-06-211-1/+1
|\ \
| * | TIF: Fix a typoJae Seo2015-06-211-1/+1
| | | | | | | | | | | | Change-Id: Iae3b359369a86224767493149b11d83ba2810ec5
* | | Merge "TIF: Remove unnecessary interface modifiers" into mnc-devJae Seo2015-06-211-1/+1
|\ \ \ | |/ /
| * | TIF: Remove unnecessary interface modifiersJae Seo2015-06-211-1/+1
| | | | | | | | | | | | Change-Id: I6b0744b32207bece45bc7ac6bee279b244f8cd3b
* | | Merge "TIF: Replace StringBuffer with String" into mnc-devJae Seo2015-06-211-6/+2
|\ \ \ | |/ /
| * | TIF: Replace StringBuffer with StringJae Seo2015-06-211-6/+2
| |/ | | | | | | Change-Id: I52f7d7cc8af7d230d6a23993391f662542886f37
* | Merge "Zen: Tweak total silence new user message for non-voice devices." ↵John Spurlock2015-06-213-2/+16
|\ \ | |/ |/| | | into mnc-dev
| * Zen: Tweak total silence new user message for non-voice devices.John Spurlock2015-06-213-2/+16
| | | | | | | | | | Bug: 21953388 Change-Id: I395af64b175b22fc58d80529cdbb12ebd9e00115
* | Do not thrown on error persisting runtime permissionsSvet Ganov2015-06-201-2/+0
| | | | | | | | | | | | bug:20752986 Change-Id: I49d7e30afd49d3dcb1bcffd2fd48e9460ed5147f
* | Ensure default permissions not dropped on data wipeSvet Ganov2015-06-201-0/+3
| | | | | | | | | | | | bug:21954760 Change-Id: I15de766012e66e171d2089af574687ad513a5d57
* | Make READ_EXTERNAL_STORAGE dangerousSvet Ganov2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | We have a new storage permission group that has read and write external storage. However, read external storage is (not a regression) a normal permission while write is a dangerous one. This leads to cases where the user disables the Storage permission and apps still read form it. This change makes read external storage a dangerous permission. bug:21949045 Change-Id: I7e28f629dda6e9c1f70cb20a3d5bea74fb109890
* | Merge "Revert "Clarify handling client certificates"" into mnc-devBart Sears2015-06-201-17/+4
|\ \
| * | Revert "Clarify handling client certificates"Bart Sears2015-06-201-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | CL broke the javadoc build. This reverts commit 36cf701e1ef0e24ce865734babb526ef5e4dc9b4. Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
* | | Fixed content description of the lock icon when fingerprint is onSelim Cinek2015-06-204-4/+37
| | | | | | | | | | | | | | | | | | | | | Also surfacing Fingerprint Errors now with a message. Bug: 21565811 Change-Id: I3bba66303c08313dbca1df5ef2f20b251f541bc1
* | | Merge "Occasionally retest for captive portals once detected" into mnc-devPaul Jensen2015-06-201-0/+18
|\ \ \
| * | | Occasionally retest for captive portals once detectedPaul Jensen2015-06-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once a captive portal has been detected, retest for the presence of the captive portal every 10 minutes. Some WiFi routers present a captive portal when the backhaul goes away; with this change if the backhaul returns and the captive portal goes away, the device will detect this after a period and remove the notification. Bug: 21545788 Change-Id: Icabf0a3fff37bccc95f99eba52af13f7a2ddc2f3
* | | | Merge "Speed up network transition when WiFi disconnects" into mnc-devPaul Jensen2015-06-201-12/+23
|\ \ \ \
| * | | | Speed up network transition when WiFi disconnectsPaul Jensen2015-06-201-12/+23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before falling back to cellular we used to first delete all the network routing tables and rules for WiFi. This isn't necessary and can take significant time as it requires a lot of netd shelling out to ip and ip[6]tables to flush routes and remove the incoming packet mark rule. Instead have netd delete all the network routing tables and rules after we've either fallen back to cellular or at least kicked off a cellular connection attempt. Bug: 21932815 Change-Id: Iabac4a8b962492682df3073cc41a12e35bc9f1bb
* | | | Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, ↵Paul Jensen2015-06-204-3/+62
|\ \ \ \ | | | | | | | | | | | | | | | PendingIntent)" into mnc-dev
| * | | | Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)Paul Jensen2015-06-184-3/+62
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this API we're more or less encouraging apps to have long running processes (battery draining) to receive NetworkCallbacks for the stateful NetworkCapabilities NET_CAPABILITIES_VALIDATED and NET_CAPABILITIES_CAPTIVE_PORTAL. With this API they can instead using PendingIntents which outlive their apps. Bug: 21343774 Change-Id: I168d0ac3757729acf7ca5546079846f575a0eedd
* | | | Merge "Don't send spurious onAvailable NetworkCallbacks when rematching" ↵Paul Jensen2015-06-203-39/+260
|\ \ \ \ | | | | | | | | | | | | | | | into mnc-dev
| * | | | Don't send spurious onAvailable NetworkCallbacks when rematchingPaul Jensen2015-06-193-39/+260
| | | | | | | | | | | | | | | | | | | | | | | | | Bug:21762680 Change-Id: Ia701045dffc666fe75fba0e1771872147e37179a
* | | | | Merge "Fix regression in viewing app info from ChooserActivity targets" into ↵Adam Powell2015-06-202-0/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | Fix regression in viewing app info from ChooserActivity targetsAdam Powell2015-06-192-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add metrics logging to ChooserActivity Bug 21953567 Bug 21953720 Change-Id: I6bba2cfe9b9e551e6fe6f2d4f92fc040eebf355c
* | | | | | Merge "Frameworks/base: Update preloaded-classes" into mnc-devAndreas Gampe2015-06-201-285/+1104
|\ \ \ \ \ \
| * | | | | | Frameworks/base: Update preloaded-classesAndreas Gampe2015-06-181-285/+1104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update for Android M release. Bug: 21760614 Change-Id: Ib1b1ac60da894ad4a4b6b7db37d8930b0d2b9046
* | | | | | | Merge "Fix access point list jumping around in WifiSettings" into mnc-devVinit Deshpande2015-06-202-131/+221
|\ \ \ \ \ \ \
| * | | | | | | Fix access point list jumping around in WifiSettingsVinit Deshpande2015-06-182-131/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens because the scan times are very aggressive (to save power); and we don't find all APs on each scan. So on each scan, some APs are considered lost and some other are considered found; resulting in reordering the list. This change fixes that by requiring 3 scans to confirm absence of an AP. Bug: 7263326 Change-Id: I04f61ec5e5aa1589f457645acbf538c7e275a4bf
* | | | | | | | Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user ↵Doris Liu2015-06-201-7/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | choice" into mnc-dev
| * | | | | | | | Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choiceDoris Liu2015-06-191-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue states that NumberPicker.setWrapSelectorWheel(false) only works in a specific call order. The underlying problem is that NumberPicker does not remember user's preference on whether the selector wheel should be wrapped. Therefore, it only works when user sets their preference last, after everything else that could affect the choice gets executed. Bug: 19049714 Change-Id: Ic27d909cb3dd657993a4df9a04c819b6965ad11b
* | | | | | | | | am 0bdd3204: am 4437a129: Merge "docs: Add link from TV design page on DAC ↵Quddus Chong2015-06-201-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Android TV spec on Google Design site. bug: 21786976" into mnc-preview-docs * commit '0bdd320402aa3406ece0afd1c89bcd00c21b3f7a': docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976
| * \ \ \ \ \ \ \ \ am 4437a129: Merge "docs: Add link from TV design page on DAC to Android TV ↵Quddus Chong2015-06-191-0/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec on Google Design site. bug: 21786976" into mnc-preview-docs * commit '4437a1294e26507449b48783a31b422d769af53b': docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976
| | * \ \ \ \ \ \ \ \ Merge "docs: Add link from TV design page on DAC to Android TV spec on ↵Quddus Chong2015-06-191-0/+6
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google Design site. bug: 21786976" into mnc-preview-docs
| | | * | | | | | | | | docs: Add link from TV design page on DAC to Android TV spec on Google ↵Quddus Chong2015-06-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Design site. bug: 21786976 Change-Id: I7bee3feaa60d5a1a35ce2c1d93b957de150e9b86
* | | | | | | | | | | | am a5de0f30: am cdc28652: Merge "docs: Updated Recommending TV Content ↵Quddus Chong2015-06-201-15/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lesson to support card customization. bug: 21787002" into mnc-preview-docs * commit 'a5de0f30cf9edfb980f5da3e8329eeb60d77057d': docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002
| * | | | | | | | | | | am cdc28652: Merge "docs: Updated Recommending TV Content lesson to support ↵Quddus Chong2015-06-191-15/+43
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | card customization. bug: 21787002" into mnc-preview-docs * commit 'cdc28652601d977bd0964d088b9070f6d2ef32d9': docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002
| | * | | | | | | | | | Merge "docs: Updated Recommending TV Content lesson to support card ↵Quddus Chong2015-06-191-15/+43
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | customization. bug: 21787002" into mnc-preview-docs
| | | * | | | | | | | | | docs: Updated Recommending TV Content lesson to support card customization.Quddus Chong2015-06-191-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21787002 Change-Id: I3c94fbce2ac7efff1749b76af3da47506812972c
* | | | | | | | | | | | | Merge "Tweak assist disclosure animation" into mnc-devAdrian Roos2015-06-192-11/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Tweak assist disclosure animationAdrian Roos2015-06-192-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21568059 Change-Id: I81666bed4d4ae3eb1998cfdcc652921bafeae7f2
* | | | | | | | | | | | | | Merge "MediaPlayer: documentation for error/info codes." into mnc-devRobert Shih2015-06-191-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | MediaPlayer: documentation for error/info codes.Robert Shih2015-06-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documented in this change: MEDIA_ERROR_SYSTEM, and MEDIA_INFO_NETWORK_BANDWIDTH Bug: 18237764 Change-Id: I0e1efb5813ab0f65133d4119de7562912947c41d
* | | | | | | | | | | | | | | Merge "Fix spelling of a config variable." into mnc-devJunda Liu2015-06-193-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix spelling of a config variable.Jonathan Basseri2015-06-193-3/+3
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to be consistent with the style/format in CarrierConfigManager. Fortunately, nothing in packages/apps/CarrierConfig needs to be updated, since this variable doesn't have any overrides. Change-Id: I8910abd28d9c0aae68a04dcfcfb2f3d0c0466ca9
* | | | | | | | | | | | | | | Merge "Add libwilhelm to app_process." into mnc-devChristopher Ferris2015-06-191-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add libwilhelm to app_process.Christopher Ferris2015-06-171-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app exposes new/delete from a shared library, the libwilhelm shared library can wind up using the new from the app shared library, and the delete from libc++. It is completely legal for the app to export new/delete in this way, so in order to avoid this situation, preload libwilhelm in the zygote. This forces libwilhelm to always resolve the new/delete from libc++. This library cannot be added to android_runtime since libwilhelm has a shared library which depends on android_runtime. Bug: 21032018 Change-Id: Id89c196df62d98d62855a1421f397b75a7e990a9
* | | | | | | | | | | | | | | | Merge "Grant default permissions if perms reset on upgrade." into mnc-devSvetoslav2015-06-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Grant default permissions if perms reset on upgrade.Svetoslav2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I371e8eb42dc8e8953a184d29cc2a3bd2c361097e
generated by cgit v1.1 at 2025-02-13 09:40:32 +0000