summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-06-1577-1433/+1157
| | | | | Change-Id: I2b7fd1100aca78ce28f084bcf94637ba1975b21e Auto-generated-cl: translation import
* Maybe make strings happy?Jeff Sharkey2015-06-141-0/+1
| | | | | Bug: 21805255 Change-Id: I2e299a83b449aadc8e9a523fc4bbbf6f843f121d
* Start using new storage strings.Jeff Sharkey2015-06-141-11/+11
| | | | | | | | We have language for "unsupported" devices, and we're letting the user snooze missing private volumes. Bug: 21666225 Change-Id: I0bc17e6b854946036f02df5b4953b4344fa85a1f
* Merge "Remove bookmarks provider and associated permissions - framework" ↵Svetoslav2015-06-148-342/+161
|\ | | | | | | into mnc-dev
| * Remove bookmarks provider and associated permissions - frameworkSvetoslav2015-06-118-342/+161
| | | | | | | | Change-Id: I7f5a2f14a12da473f05a5075d98e762f8f8ed970
* | Merge "Clear runtime permissions on package data reset." into mnc-devSvet Ganov2015-06-141-13/+41
|\ \
| * | Clear runtime permissions on package data reset.Svet Ganov2015-06-131-13/+41
| | | | | | | | | | | | | | | | | | bug:21817488 Change-Id: I7c51fee5206e3bcb79951f237a71862f0752a709
* | | Make AppOpsManager#permissionToOp API publicSvet Ganov2015-06-143-23/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this API to implement permission checker API in the support lib that takes into account both app ops and permissions. bug:21277214 Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
* | | Merge "UsbDeviceManager: Modify default function handling" into mnc-devNick Kralevich2015-06-131-3/+3
|\ \ \
| * | | UsbDeviceManager: Modify default function handlingNick Kralevich2015-06-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adb is enabled, there's no need to also enable MTP mode. ADB mode enabled is sufficient to get connect messages from the kernel driver. This change modifies getDefaultFunctions() to return adb mode if adb is enabled, but mtp when it's not enabled. Also stop using "none" mode as the default. "none" should only be used when toggling the driver. Bug: 21429947 Change-Id: I767491417c6c69a120fcf4f3d6ec0c73311a1a60
* | | | Merge "Improve LockPatternView accessibility" into mnc-devJim Miller2015-06-133-11/+223
|\ \ \ \
| * | | | Improve LockPatternView accessibilityJim Miller2015-06-113-11/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactor "Cell added" to use ExploreByTouchHelper to allow speech to be interrupted. - Speak cell number when headphones are connected Fixes bug 18919018 Change-Id: I05818a419f4884122fe0d6af3fe15e83e8fce9c6
* | | | | am 16c31a77: (-s ours) am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: ↵Svetoslav2015-06-130-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. * commit '16c31a77f75a30189a221043ad3ce73ca1610559': DO NOT MERGE Don't take flags when creating app widget config activity.
| * \ \ \ \ am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) ↵Svetoslav2015-06-120-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. * commit '497176975f59a939f12feefb31f2f02560b6f265': DO NOT MERGE Don't take flags when creating app widget config activity.
| | * \ \ \ \ am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: ↵Svetoslav2015-06-100-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Don\'t take flags when creating app widget config activity. * commit '34c7bd7c5ca5e41e151c93cd417efd7a28157e9d': DO NOT MERGE Don't take flags when creating app widget config activity.
| | | * \ \ \ \ am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE ↵Svetoslav2015-06-100-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don\'t take flags when creating app widget config activity. * commit '74e04083569ccdd8907a91cd54f5822b2ed8f18a': DO NOT MERGE Don't take flags when creating app widget config activity.
| | | | * \ \ \ \ am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take ↵Svetoslav2015-06-100-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flags when creating app widget config activity. * commit '07264d936d4039057277151641e66671c33ed1af': DO NOT MERGE Don't take flags when creating app widget config activity.
| | | | | * \ \ \ \ am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when ↵Svetoslav2015-06-100-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating app widget config activity. * commit '18fb1c92d8c6ac732b85d7dee02a75591aec154b': DO NOT MERGE Don't take flags when creating app widget config activity.
| | | | | | * \ \ \ \ am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config ↵Svetoslav2015-06-013-8/+5
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity. * commit 'bf0652eeea280bb1d687fe2fc3e869e0f6e9a541': DO NOT MERGE Don't take flags when creating app widget config activity.
| | | | | | | * | | | | DO NOT MERGE Don't take flags when creating app widget config activity.Svetoslav2015-06-013-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:19618745 Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
* | | | | | | | | | | | Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-devMakoto Onuki2015-06-131-7/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix ArrayIndexOutOfBoundsException in Transport.queryMakoto Onuki2015-06-121-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was that it used getCount() instead of getColumnCount(). Bug 21727804 Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b
* | | | | | | | | | | | | Merge "Fix dark mode for custom views" into mnc-devJorim Jaggi2015-06-134-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix dark mode for custom viewsJorim Jaggi2015-06-114-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20847909 Change-Id: I9f5c6cf2d0fa4e632ce654660050a48c76bc671b
* | | | | | | | | | | | | | Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-devMakoto Onuki2015-06-124-1/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add StorageEventListener.onDiskDestroyed()Makoto Onuki2015-06-124-1/+56
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21336042 Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b
* | | | | | | | | | | | | | Merge "Fix negative inactiveTime on creating a new user" into mnc-devAmith Yamasani2015-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix negative inactiveTime on creating a new userAmith Yamasani2015-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize the beginIdleTime to 0 rather than current time. Bug: 21699099 Change-Id: Ib94a9198c4e80aea5d9de68c5cf5d6f8cfc79e0a
* | | | | | | | | | | | | | | Merge "Fix rounding width." into mnc-devRuben Brunk2015-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix rounding width.Ruben Brunk2015-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19930700 Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7
* | | | | | | | | | | | | | | | Merge "App Standby: Convert constants to Settings.Global" into mnc-devAdam Lesinski2015-06-122-42/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | App Standby: Convert constants to Settings.GlobalAdam Lesinski2015-06-122-42/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use settings instead of hardcoded constants, and listen for their changes. Bug:21640379 Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324
* | | | | | | | | | | | | | | | | Merge "More useful extras in disk/volume broadcasts." into mnc-devJeff Sharkey2015-06-123-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | More useful extras in disk/volume broadcasts.Jeff Sharkey2015-06-123-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
* | | | | | | | | | | | | | | | | | Merge "BatteryStatsHelper: Fix some lost power" into mnc-devAdam Lesinski2015-06-122-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | BatteryStatsHelper: Fix some lost powerAdam Lesinski2015-06-122-7/+13
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like we were losing some power calculations from the CPU side of Bluetooth and WiFi if there was no controller activity ocurring. Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth. Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439
* | | | | | | | | | | | | | | | | | Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-devAdam Lesinski2015-06-121-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | BatteryStats: Wifi energy data is sometimes wrongAdam Lesinski2015-06-121-2/+11
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wifi energy data sometimes reports negative values. The bug is filed, but in the meanwhile, batterystats calculations are way off due to strange values. Now we ignore invalid data, and sample again later. Bug:21613534 Change-Id: I3c5c1385e15d85346e6fd3a2737cb58ca706ab74
* | | | | | | | | | | | | | | | | | Merge "Put WebViews with on a HW layer if stencil/shader clipping is needed" ↵Chris Craik2015-06-126-19/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | | | | | | Put WebViews with on a HW layer if stencil/shader clipping is neededChris Craik2015-06-126-19/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17322378 Change-Id: I0de574bf116b30e2ad4194366e19d47d49708902
* | | | | | | | | | | | | | | | | | | Merge "Don't use upgrade-key-sets check when scanning during boot." into mnc-devdcashman2015-06-122-40/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Don't use upgrade-key-sets check when scanning during boot.dcashman2015-06-122-40/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps may specify upgrade-key-sets which are different than their current signing keys to prevent a future upgrade with the current set of keys. Every package is re-scanned on boot, however, so the existing application would violate its own recorded upgrade-key-sets. Change the key verification check to ignore upgrade-key-sets on boot. Also default to the same-sig checks if the upgrade-key-set meta-data has been corrupted. Bug: 21785716 Change-Id: I5c0c1e2017ec780a745a74488620bfe95b052269
* | | | | | | | | | | | | | | | | | | | Merge "Fix legacy disconnect callback." into mnc-devRuben Brunk2015-06-121-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix legacy disconnect callback.Ruben Brunk2015-06-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21708377 Change-Id: I17e9fe0fda77e8f4cb00578d5d9658dc24cab543
* | | | | | | | | | | | | | | | | | | | | Merge "Fixing no first "device added" notification." into mnc-devPaul McLean2015-06-121-34/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fixing no first "device added" notification.Paul McLean2015-06-121-34/+48
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 21674851 Change-Id: I3b2ed1cf00342471a5c70f2aecc832480d7e06fd
* | | | | | | | | | | | | | | | | | | | | Merge "Removing screen artifacts afer orientation change in sleep mode" into ↵Stefan Kuhne2015-06-121-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | | | | | | | | | Removing screen artifacts afer orientation change in sleep modeStefan Kuhne2015-06-121-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoiding screen artifacts upon rotation change in sleep mode. This will be done by postponing orientation changes until the entire UI got drawn. Bug: 16849724 Change-Id: Ib1d818258d12f5c1909de4558af46aec27e29c75
* | | | | | | | | | | | | | | | | | | | | | Merge "MidiDeviceServer: Fix race condition in setting device server's ↵Mike Lockwood2015-06-125-11/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mDeviceInfo" into mnc-dev
| * | | | | | | | | | | | | | | | | | | | | | MidiDeviceServer: Fix race condition in setting device server's mDeviceInfoMike Lockwood2015-06-115-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This made it unsafe to open ports on a device from the MidiManager onDeviceOpened callback Bug: 21760692 Change-Id: I536acdf574a3ccecdb66a8fde87089538e8bb1ef