OSDN Git Service

android-x86/frameworks-base.git
7 years agoAdd observer for extcon events
Faouaz TENOUTIT [Wed, 28 Jan 2015 09:57:01 +0000 (10:57 +0100)]
Add observer for extcon events

Recent kernel drivers are using EXTCON instead of SWITCH class.

This patch will extend the current WiredAccessoryManager to monitor
and notify about both events (switch & extcon), depending on the current
running kernel configuration.

Issue: IRDA-3090

Change-Id: Ica61534236ed96eda3afdc44934741945b243952
Signed-off-by: Faouaz TENOUTIT <faouaz.tenoutit@intel.com>
Signed-off-by: Guillaume Zajac <guillaume.zajac@intel.com>
Reviewed-on: https://android.intel.com/327024
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Bhat, Sudheendra S <sudheendra.s.bhat@intel.com>
Tested-by: Bhat, Sudheendra S <sudheendra.s.bhat@intel.com>
Reviewed-on: https://android.intel.com/335886
Reviewed-by: Fagerstedt, Axel <axel.fagerstedt@intel.com>
Reviewed-on: https://android.intel.com/385132
Reviewed-by: Sjolander, Simon <simon.sjolander@intel.com>
Tested-by: Sjolander, Simon <simon.sjolander@intel.com>
Tested-by: Fagerstedt, Axel <axel.fagerstedt@intel.com>
7 years agoBackport of backup transport whitelist
Christopher Tate [Fri, 20 May 2016 22:29:31 +0000 (15:29 -0700)]
Backport of backup transport whitelist

Sysconfig define a whitelist of permitted backup transports

Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.

Bug 28406080

Backport of 494df791728f4d42d67e935c327910975993ad29 from N

Change-Id: I9f90e324169a68720d608f74754d284a7e59cf87

7 years agoBackport ChooserTarget package source check from N
Adam Powell [Thu, 28 Apr 2016 23:32:18 +0000 (16:32 -0700)]
Backport ChooserTarget package source check from N

Fix a bug where a ChooserTargetService could supply a ChooserTarget
pointing at a non-exported activity outside of its own package and
have it launch.

Bug 28384423

Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008

7 years agoDon't pass URL path and username/password to PAC scripts
Paul Jensen [Fri, 15 Apr 2016 14:41:13 +0000 (10:41 -0400)]
Don't pass URL path and username/password to PAC scripts

The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.

Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed

7 years agoFix missing permission check when saving pattern/password
Jim Miller [Wed, 13 Apr 2016 23:35:36 +0000 (16:35 -0700)]
Fix missing permission check when saving pattern/password

Fixes bug 28163930

Change-Id: Ic98ef20933b352159b88fdef331e83e9ef6e1f20

8 years agoKill the real/isolated uid group, not the ApplicationInfo uid
Christopher Tate [Mon, 18 Apr 2016 22:16:31 +0000 (15:16 -0700)]
Kill the real/isolated uid group, not the ApplicationInfo uid

This is a direct reimplementation in L of fixes applied to N in
these two commits:

8dc8d37c1d7d694016f1ec2b3cea5fb723567be8
e8741d23d2dd05c4cb3fed5ee6a4040ee96a60e3

Bug 19285814

Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa

Resolve merge conflict when cp'ing ag/941553 to mnc-mr1-release branch

8 years agoAdd new, hidden MotionEvent flag for partially obscured windows.
Michael Wright [Thu, 31 Mar 2016 00:31:48 +0000 (17:31 -0700)]
Add new, hidden MotionEvent flag for partially obscured windows.

Bug: 26677796
Change-Id: Ic4219b883bb760495e6172ef61e84e9725876ef6

8 years ago[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Mon, 14 Mar 2016 22:57:02 +0000 (15:57 -0700)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings

Disallow existing and newly created guest users from
changing Wifi settings.

BUG: 27411179
TEST: Flashed device, switched to existing guest user, and verified
      that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
      settings are disabled.

Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3

8 years agoRedact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
Redact Account info from getCurrentSyncs

BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)

8 years agoConflict resolution CL to ag/868720 when cp'ing to mnc-mr1-release
Zach Jang [Sat, 27 Feb 2016 00:06:28 +0000 (16:06 -0800)]
Conflict resolution CL to ag/868720 when cp'ing to mnc-mr1-release

Change-Id: I3efe5476ebd758fc567bfdb035583a01c45aea8b

8 years agoDO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
Andre Eisenbach [Thu, 14 Jan 2016 22:20:34 +0000 (14:20 -0800)]
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.

Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".

Bug: 26548845
Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949
(cherry picked from commit 3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7)

8 years agoDO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
Liejun Tao [Wed, 20 Jan 2016 23:52:20 +0000 (17:52 -0600)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case

For the lowest music volume steps 1 and 2, restrict the gain to 50% and
75%. This will avoid the lowest volume steps being too loud for some
accessories. For music volume 0, set phone gain to 0 as some
accessories won't mute on their end.

Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f
Signed-off-by: Liejun Tao <baibai@motorola.com>
8 years agoDO NOT MERGE ANYWHERE: Hack to get devices booting again.
Jeff Sharkey [Fri, 29 Jan 2016 17:45:45 +0000 (10:45 -0700)]
DO NOT MERGE ANYWHERE: Hack to get devices booting again.

If we try scheduling a pass before the system is ready, record a
pending event and dispatch once we're actually ready.

Bug: 26863668
Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc
(cherry picked from commit 538c11cf2175d4e30337e8776401bfede85866be)

8 years agoDO NOT MERGE ANYWHERE: Don't change screen on time on time changes
Adam Lesinski [Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)]
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

Screen on time should be measured in elapsed realtime, not wallclock.

Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).

When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)

Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7

8 years agoDO NOT MERGE Fix for syncs being dropped when appIdle is on
Shreyas Basarge [Mon, 11 Jan 2016 15:43:54 +0000 (15:43 +0000)]
DO NOT MERGE Fix for syncs being dropped when appIdle is on

Syncs were being dropped when appIdleMode was on for
an app. This CL backs off the sync instead of dropping
it. When the app becomes non-idle, backoff is cleared
and the sync is performed.

Bug: 26355386
Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
(cherry picked from commit 2c051498b2b0e2608740d906e70867b74083107d)

8 years agoDO NOT MERGE Check apps idle states on time changes
Amith Yamasani [Fri, 22 Jan 2016 19:27:16 +0000 (11:27 -0800)]
DO NOT MERGE Check apps idle states on time changes

And ensure that the listeners are informed of app standby transitions
that might occur during time changes.

Fix for apps that sometimes don't have network access until reboot.

Bug: 26488100
Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23
(cherry picked from commit c465e71cdc401e1565c29a895a5c6d366ba5344c)

8 years agoDO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle
Adam Lesinski [Wed, 13 Jan 2016 20:26:07 +0000 (12:26 -0800)]
DO NOT MERGE ANYWHERE: UsageStats: Use new settings key idle_duration2 for app idle

Ignores the old, re-appropriated key "idle_duration" which is now
set to a high value in order to force disable app idle on devices
with bug b/26355386

Bug:26355386
Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090

8 years agoDO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time...
Adam Lesinski [Tue, 12 Jan 2016 18:36:09 +0000 (10:36 -0800)]
DO NOT MERGE ANYWHERE: UsageStats: Fix issue where initializing data for first time would cause crash

With the updated rolling window of stats for app idleness, we need to make sure
it is populated before we initialize some defaults.

Now that we look at older entries to figure out idleness, if those
entries are in the future (due to time change), set them to the current
screen on time.
Bug:26504153

Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69

8 years agoDO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time
Adam Lesinski [Fri, 8 Jan 2016 02:24:53 +0000 (18:24 -0800)]
DO NOT MERGE ANYWHERE: UsageStatsService: Fix app idle issue at rollover time

App Idle queries are very frequent and so they only check in memory stats.
However, in memory stats can be missing some entries, especially after a rollover, but also
due to a larger bug fixed in master (too risky to take now).

The fix is to do a deep query (reading older files from disk) and maintain a parallel cache
of stats for app idle. That way the rolling window of data required to serve app idle queries
stays in memory.

Bug:26355386
Change-Id: I6a29bbc25214f6a3c2f24c8c079936e66f99e42e

8 years agoFix missing observer reply callbacks
Amith Yamasani [Fri, 20 Nov 2015 17:44:08 +0000 (09:44 -0800)]
Fix missing observer reply callbacks

This was causing upto 2 seconds in user switching delay.

Bug: 25813588
Change-Id: Icf23b021f134a8ccfa2dae470af02b2da7454acc

8 years agoExit getAllValidScorers early if not the primary.
Jeremy Joslin [Fri, 18 Dec 2015 01:38:04 +0000 (17:38 -0800)]
Exit getAllValidScorers early if not the primary.

This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.

BUG: 23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
(cherry picked from commit 5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76)

8 years agoDO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.

Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.

Bug: 26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
(cherry picked from commit 8d9aea8a1870ad83d9eccba1068a1685da5e96d0)

8 years agoCheck permissions on getDeviceId.
Robert Greenwalt [Fri, 4 Dec 2015 19:51:49 +0000 (11:51 -0800)]
Check permissions on getDeviceId.

This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360

8 years agomerge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Thu, 17 Dec 2015 21:08:37 +0000 (13:08 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev

8 years agomerge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 15 Dec 2015 20:54:59 +0000 (12:54 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev

8 years agoDO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Tue, 1 Dec 2015 00:09:55 +0000 (16:09 -0800)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread

Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.

Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)

8 years agoDO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson [Wed, 4 Nov 2015 22:24:43 +0000 (14:24 -0800)]
DO NOT MERGE Ensure that the device is provisioned before showing Recents.

Bug: 25476219

Change-Id: Ibbe621748f7275f8c1ccded84612ca16292559eb

8 years agoDon't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Wed, 11 Nov 2015 23:01:35 +0000 (15:01 -0800)]
Don't allow contact sharing by default for device not recognized as carkit.

+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.

Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a

8 years agoRevert "Fix race condition when setting default ringtones"
Ian Pedowitz [Wed, 11 Nov 2015 21:38:04 +0000 (21:38 +0000)]
Revert "Fix race condition when setting default ringtones"

This reverts commit f2cb9341ff864e6d9cc6797857665b2281643a74.

Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0

8 years agoFix race condition when setting default ringtones
Marco Nelissen [Fri, 6 Nov 2015 00:44:52 +0000 (16:44 -0800)]
Fix race condition when setting default ringtones

If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6

8 years agoBlock directory selection in openable modes.
Jeff Sharkey [Fri, 6 Nov 2015 17:16:22 +0000 (09:16 -0800)]
Block directory selection in openable modes.

When picking documents to return to apps requesting CATEGORY_OPENABLE
we can't let the user select directories.

Bug: 25455200
Change-Id: I8076883ee5b019eab4d2adb841952865f21e413e

8 years agoKick movement preconditions onto handler thread.
Jeff Sharkey [Thu, 5 Nov 2015 18:00:05 +0000 (10:00 -0800)]
Kick movement preconditions onto handler thread.

The bulk of package moving already occurs on the handler thread,
but one of the precondition steps requires that we make an installd
call to calculate disk space of the app.  If there was already
another long-running installd call going on, we could end up ANR'ing
the caller.

Since movePackage() is already designed to return a moveId and go
async, we can push all the precondition steps onto the handler thread
to prevent the ANR.

Bug: 25490003
Change-Id: I62d555c23bbf81b791f6f4cabc40c3d64c580cf8

8 years agoRevert "Remove -ffast-math from libhwui makefile"
Chris Craik [Thu, 5 Nov 2015 17:58:28 +0000 (17:58 +0000)]
Revert "Remove -ffast-math from libhwui makefile"

This reverts commit e02ec7c37a92fd63748a610bac6a23d0409788cf.

Change-Id: Iea7fadf04c4ffa62be28f783342ae749f89bf931

8 years agoWhen the incoming light source is invalid, don't generate any shadow
Teng-Hui Zhu [Thu, 5 Nov 2015 00:57:53 +0000 (16:57 -0800)]
When the incoming light source is invalid, don't generate any shadow

b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507

8 years agoEarly return when the scale is 0.
Teng-Hui Zhu [Thu, 1 Oct 2015 23:49:16 +0000 (16:49 -0700)]
Early return when the scale is 0.

b/24534579

Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
(cherry picked from commit 8d0ec389531d071529fb0a800f10733b057205d9)

8 years agoRemove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 18:12:28 +0000 (10:12 -0800)]
Remove -ffast-math from libhwui makefile

bug:25417885

Change-Id: I8244bd28c2d46fc449398b9bf5104bf7cbaded8a

8 years agoRevert "Use clang for libhwui"
John Reck [Wed, 4 Nov 2015 15:21:35 +0000 (15:21 +0000)]
Revert "Use clang for libhwui"

Bug 25462107

This reverts commit d354fd2c66855d116440eb4c936317f124241225.

Change-Id: Ib7c50b5becf247f837f3cc20f9128d9411d22563

8 years agoConvert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 07:36:52 +0000 (23:36 -0800)]
Convert ashmem bitmap thresholds to constants.

Bug 25256717

Change-Id: I23e2795ef8798d83bf60dcbd6ff2e7093fcaa9b0
Signed-off-by: Riley Andrews <riandrews@google.com>
8 years agoUse clang for libhwui
Chris Craik [Tue, 3 Nov 2015 18:33:34 +0000 (10:33 -0800)]
Use clang for libhwui

bug:25417885

Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156

8 years agoLimit persistent ashmem backed fds to a minimum of 128kB.
Riley Andrews [Mon, 2 Nov 2015 07:36:04 +0000 (23:36 -0800)]
Limit persistent ashmem backed fds to a minimum of 128kB.

Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
8 years agoFix issue #25357209: Could not send SMS or MMS messages, had to reboot
Dianne Hackborn [Mon, 2 Nov 2015 21:43:29 +0000 (13:43 -0800)]
Fix issue #25357209: Could not send SMS or MMS messages, had to reboot

I think what probably happened is that since we only report an app
going in to the "interaction" state as an interaction event to usage
stats, apps that sit around in that state forever will only see one
interaction at the start and never again.  So usage stats could start
thinking they are idle.

Fix this by having the activity manager report an interaction event
for such long running applications at least once a day.

Also, because it is correct and for paranoia by protected us another
way, system uids should never go in to standby.

Change-Id: I8a3805bfca86cbe78560488a649ecd07427da99a

8 years agoFix a crash while printing ICCID because of alphabets in UICC.
Sanket Padawe [Mon, 2 Nov 2015 23:45:18 +0000 (15:45 -0800)]
Fix a crash while printing ICCID because of alphabets in UICC.

Bug: 25401769
Change-Id: Ieda058817b8d3cb4b1696fd9932bd0f10da55573

8 years agoFixed a bug where the panel could get stuck closing
Selim Cinek [Mon, 2 Nov 2015 21:42:58 +0000 (13:42 -0800)]
Fixed a bug where the panel could get stuck closing

When mClosing was set even though the panel was not
expanding, the variable was never reset leading to
bad states like the notification shade not updating,
people missing calls and similar bad bugs.

Bug: 25338991
Change-Id: I4362fda257770c98c5f9ba75a5622b14f74dc5ae

8 years agoImprove comment on EXTRA_CALL_RAT_TYPE.
Tyler Gunn [Mon, 2 Nov 2015 19:24:57 +0000 (11:24 -0800)]
Improve comment on EXTRA_CALL_RAT_TYPE.

Adding comments to EXTRA_CALL_RAT_TYPE to make it clear what it is used
for, and what values are expected.

Bug: 20144385
Change-Id: I248aca61abc8a57d7aeef650e48cc498e41c859b

8 years agoNetworkTimeUpdateService: Grab a wakelock when manipulating system time
Thierry Strudel [Thu, 29 Oct 2015 21:40:29 +0000 (14:40 -0700)]
NetworkTimeUpdateService: Grab a wakelock when manipulating system time

Bug: 24986869
Change-Id: Iab4e5ce6be0b5279ce85f868037ba256ee62c0ac
Signed-off-by: Thierry Strudel <tstrudel@google.com>
8 years agoDon't try overriding system fixed permissions on install
Svet Ganov [Mon, 2 Nov 2015 17:32:01 +0000 (09:32 -0800)]
Don't try overriding system fixed permissions on install

bug:25397466

Change-Id: Ie92ec000a94b757178ddfdd9384407535f4af9db

8 years agoPackageSettingBase needs to copy volume UUID.
Jeff Sharkey [Sat, 31 Oct 2015 20:58:54 +0000 (13:58 -0700)]
PackageSettingBase needs to copy volume UUID.

When copying all fields from one PackageSettingBase to another, we
also need to copy volumeUuid, which had previously been missed.

Without this, packages using sharedUserId that are installed on
adopted storage devices will be destroyed, since after reboot we
think they actually belong on internal storage (where volumeUuid is
null).

Bug: 25334169
Change-Id: I223361bd1e19e7d5dd78626682ac7c5cbecb9fa1

8 years agoHandle "uninstalled" apps when pruning app-ops.
Jeff Sharkey [Fri, 30 Oct 2015 02:00:44 +0000 (19:00 -0700)]
Handle "uninstalled" apps when pruning app-ops.

During system boot, we prune app-ops belonging to apps that have
been uninstalled.  However, apps installed on adopted storage devices
haven't been scanned at this point, so they appear to be uninstalled.

To avoid pruning app-ops for these apps, we need a getPackageUid()
variant that also considers "uninstalled" apps for which we still
have PackageSetting values.

Bug: 25206071
Change-Id: I1820f674d45c5ddc1c5f10ed7d859e7025005e28

8 years agoIMS: Support For Per-Call RAT Info
Omkar Kolangade [Thu, 29 Oct 2015 22:06:27 +0000 (15:06 -0700)]
IMS: Support For Per-Call RAT Info

Adding the extra key that will be used to
propagate RAT information for each call via
call extras. The key is used in IMS Service.

Bug: 20144385
Change-Id: Ia7ca81d661afb579fd25315036c43489b1dca50d

8 years agoAllow verifier to grant permissions
Svetoslav [Fri, 30 Oct 2015 00:00:06 +0000 (17:00 -0700)]
Allow verifier to grant permissions

bug:25329324

Change-Id: I2ac01a983ad812df7725a0499a8d9b470a7ea481

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 29 Oct 2015 19:27:09 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25319151
Change-Id: I4170f31d992d23a365c98fe5e799a31ef48f17bd

8 years agoGet rid of getTypesVisibleToCaller log spam.
Carlos Valdivia [Thu, 29 Oct 2015 23:41:21 +0000 (16:41 -0700)]
Get rid of getTypesVisibleToCaller log spam.

Bug: 25062620
Change-Id: Ia3080c501a288522a5b1de88d50f365357418ba8

8 years agoUsbDeviceManager: set mUsbDataUnlocked=false on user switch
Nick Kralevich [Thu, 29 Oct 2015 19:45:23 +0000 (12:45 -0700)]
UsbDeviceManager: set mUsbDataUnlocked=false on user switch

Make sure access to MTP data is relocked when a user switch occurs.

Bug: 25288494
Change-Id: I69dafc7f51b847f4dba1993a85fb1a51df1a5e37

8 years agoDon't crash if a DHCP server doesn't send the server ID option.
Lorenzo Colitti [Thu, 29 Oct 2015 06:21:54 +0000 (15:21 +0900)]
Don't crash if a DHCP server doesn't send the server ID option.

This violates a MUST in RFC2131, but apparently some
implementations don't know or care.

Bug: 25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149

8 years agoMerge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev
Svetoslav Ganov [Thu, 29 Oct 2015 01:10:46 +0000 (01:10 +0000)]
Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 28 Oct 2015 14:38:11 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 14:37:31 +0000 (07:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 28 Oct 2015 13:59:45 +0000 (06:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import

8 years agoMake SYSTEM_ALERT_WINDOW development permission
Svetoslav [Tue, 27 Oct 2015 22:22:39 +0000 (15:22 -0700)]
Make SYSTEM_ALERT_WINDOW development permission

bug:25329324

Change-Id: I0086464846bab9424764dd0d726692d96a0f1207

8 years agoMerge "Petites fautes." into mnc-dr-dev
Daniel Sandler [Tue, 27 Oct 2015 19:51:31 +0000 (19:51 +0000)]
Merge "Petites fautes." into mnc-dr-dev

8 years agoPetites fautes.
Dan Sandler [Tue, 27 Oct 2015 17:42:55 +0000 (13:42 -0400)]
Petites fautes.

Bug: 25308153
Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed

8 years agoFix issue #25289999: Lower device idle alarm limit to 10 mins.
Dianne Hackborn [Tue, 27 Oct 2015 00:51:57 +0000 (17:51 -0700)]
Fix issue #25289999: Lower device idle alarm limit to 10 mins.

This helps with some cases where perisistent network connections
need a more frequent keep alive signal.  Actually make it 9
minutes to ensure that things needing a 10 minute cycle will
execute within that time.

Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 26 Oct 2015 16:28:12 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 16:27:14 +0000 (11:27 -0500)]
Import translations. DO NOT MERGE

Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 26 Oct 2015 14:17:06 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import

8 years agoMerge "Prevent recents from coming up when in SUW" into mnc-dr-dev
Puneet Kumar [Sat, 24 Oct 2015 15:20:28 +0000 (15:20 +0000)]
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev

8 years agoPrevent recents from coming up when in SUW
Michael Wright [Sat, 24 Oct 2015 12:24:15 +0000 (13:24 +0100)]
Prevent recents from coming up when in SUW

Bug: 25229538
Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:45:01 +0000 (00:45 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5  -s ours
am: e68e70d509

* commit 'e68e70d509e2a0ba1c8bd56c231bf1c6cc3da967':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:33:48 +0000 (00:33 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b am: 511357c39b
am: 7e16b2e8f5  -s ours

* commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:15:49 +0000 (00:15 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours am: 410bea181b
am: 511357c39b

* commit '511357c39b058b0d03beb175c1c35990729ee3d0':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e...
Dan Sandler [Sat, 24 Oct 2015 00:15:44 +0000 (00:15 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07  -s ours
am: ab4857790b

* commit 'ab4857790bc84388817c0bec8c4010d660f35ada':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
Dan Sandler [Sat, 24 Oct 2015 00:04:17 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e
am: 6c3186ea07  -s ours

* commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a...
Dan Sandler [Sat, 24 Oct 2015 00:04:06 +0000 (00:04 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a  -s ours
am: 410bea181b

* commit '410bea181b229adef7a2c1a9308379eead260706':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
Dan Sandler [Fri, 23 Oct 2015 23:49:56 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77
am: 6026b5b17e

* commit '6026b5b17e786c180909d8fe5f6747e446e1d365':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
Dan Sandler [Fri, 23 Oct 2015 23:49:54 +0000 (23:49 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3
am: b1de85487a  -s ours

* commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:50 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 51c2619c77

* commit '51c2619c7706575a171cf29819db14e91b815a62':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:39 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 446dcc9ed7

* commit '446dcc9ed7efa0b80ed7d353478326b2236f2cab':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Fri, 23 Oct 2015 23:39:22 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am: 1044e162c3

* commit '1044e162c3dc4169b79112fc1a2de14757bca8c3':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE

8 years agoMerge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev
xin He [Fri, 23 Oct 2015 20:45:24 +0000 (20:45 +0000)]
Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev

8 years ago[DO NOT MERGE] EAP-TLS PMKID mismatch error
xinhe [Wed, 21 Oct 2015 18:47:03 +0000 (11:47 -0700)]
[DO NOT MERGE] EAP-TLS PMKID mismatch error

b/24253154

Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e

8 years agoMerge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev

8 years agoMerge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc...
Dianne Hackborn [Fri, 23 Oct 2015 17:04:55 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc-dr-dev

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

Bug: 19121797
Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9

8 years agoDelay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE

Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
(cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)

8 years agoRevert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Thu, 22 Oct 2015 23:12:01 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""

This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158

8 years agoDO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
Dianne Hackborn [Fri, 23 Oct 2015 00:40:23 +0000 (17:40 -0700)]
DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...

...after more than 60 minutes left

The sensing timeout alarm was being cancelled immediately after it
was scheduled it.  Now only cancel it when we are done sensing or
have reset activity.

Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af

8 years agoRemove tether_apndata for Sasktel
Sungmin Choi [Fri, 16 Oct 2015 21:39:22 +0000 (14:39 -0700)]
Remove tether_apndata for Sasktel

Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).

BUG=25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296

8 years agoMerge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
Ian Pedowitz [Thu, 22 Oct 2015 22:26:32 +0000 (22:26 +0000)]
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev

8 years agoRevert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:08:07 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"

This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667

8 years agoMerge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev
Nicolas Prévot [Thu, 22 Oct 2015 20:29:51 +0000 (20:29 +0000)]
Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev

8 years agoSystemUI: fix automatic pairing of BT keyboards
Dmitry Torokhov [Thu, 22 Oct 2015 17:07:53 +0000 (10:07 -0700)]
SystemUI: fix automatic pairing of BT keyboards

After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.

Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.

Bug: 24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811

8 years agoDon't resolve cross-profile app links without intent picker.
Nicolas Prevot [Thu, 22 Oct 2015 13:55:26 +0000 (14:55 +0100)]
Don't resolve cross-profile app links without intent picker.

If ALLOW_CROSS_PROFILE_APP_LINKING has been set:
If there is an app with status always across profiles, and some
apps without status always in the current profile: show an intent
picker instead of directly resolving across profiles.

BUG:25109215

Change-Id: I74a67d231284ce912121ea0818109fbf904183e8

8 years agoFix crash on calling removeSelection with showing selection handlers
Yoshiki Iguchi [Thu, 15 Oct 2015 04:34:41 +0000 (13:34 +0900)]
Fix crash on calling removeSelection with showing selection handlers

A crash occured on updating after calling removeSelection with showing
selection handlers. This was because some selection-handler code didn't
consider the case the selection index was -1 (-1 means there is no selection).
This patch fixes this crash.

Bug: 23299977
Change-Id: I736d315e073f773aec597522203015205a8da42b

8 years agoMerge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
Lorenzo Colitti [Thu, 22 Oct 2015 06:15:05 +0000 (06:15 +0000)]
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev

8 years agoAdd the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
Nathan Harold [Thu, 22 Oct 2015 03:12:10 +0000 (20:12 -0700)]
Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()

-Fixed doc string

Bug: 23979591

This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003.

Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702

8 years agoMerge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellIn...
Nathan Harold [Thu, 22 Oct 2015 02:54:45 +0000 (02:54 +0000)]
Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev

8 years agoRevert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
Nathan Harold [Thu, 22 Oct 2015 02:53:57 +0000 (02:53 +0000)]
Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"

This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299.

Doc string isn't resolving. Temporarily reverting.

Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e

8 years agoMerge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo(...
Nathan Harold [Thu, 22 Oct 2015 01:58:37 +0000 (01:58 +0000)]
Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev

8 years agoMerge "Track ashmem memory usage in Parcel" into mnc-dr-dev
Adrian Roos [Thu, 22 Oct 2015 00:46:03 +0000 (00:46 +0000)]
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev