OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:33:13 +0000 (11:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 22 Oct 2016 11:32:49 +0000 (11:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 22 Oct 2016 08:11:45 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 22 Oct 2016 07:52:51 +0000 (00:52 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Fix vpn branded string usage" into nyc-mr1-dev
TreeHugger Robot [Sat, 22 Oct 2016 02:23:04 +0000 (02:23 +0000)]
Merge "Fix vpn branded string usage" into nyc-mr1-dev

7 years agoFix vpn branded string usage
Jason Monk [Fri, 21 Oct 2016 23:27:34 +0000 (19:27 -0400)]
Fix vpn branded string usage

Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes: 32071681

7 years agoVPN network stat accounting changes.
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
VPN network stat accounting changes.

Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd

7 years agoMerge "Default for sending package name to support should be false" into nyc-mr1-dev
Matthew Fritze [Thu, 20 Oct 2016 21:05:06 +0000 (21:05 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev

7 years agoDefault for sending package name to support should be false
Matthew Fritze [Thu, 20 Oct 2016 18:05:47 +0000 (11:05 -0700)]
Default for sending package name to support should be false

Change-Id: I2cc90cac2c2c72f9febb015487f8854ebf006aac
Fixes: 32303343
Test: manual

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 20 Oct 2016 15:53:26 +0000 (15:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 20 Oct 2016 15:52:50 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 14:17:55 +0000 (07:17 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 10:57:17 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 20 Oct 2016 10:49:00 +0000 (03:49 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev
TreeHugger Robot [Thu, 20 Oct 2016 02:21:34 +0000 (02:21 +0000)]
Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev

7 years agoMerge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices....
Tyler Gunn [Thu, 20 Oct 2016 00:56:18 +0000 (00:56 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." into nyc-mr1-dev

7 years agoFixed a grey flash when swiping away the last notification
Selim Cinek [Wed, 19 Oct 2016 23:49:44 +0000 (16:49 -0700)]
Fixed a grey flash when swiping away the last notification

Change-Id: I12edf673f29abad66fa6704004886124eee9978b
Fixes: 32289359
Test: have 1 notification, swipe it a way, observe no flashing in statusbar

7 years agoMerge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc...
Kevin Hufnagle [Wed, 19 Oct 2016 23:43:49 +0000 (23:43 +0000)]
Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev

7 years agoMerge "Skip getting transforms for ignored tasks." into nyc-mr1-dev
TreeHugger Robot [Wed, 19 Oct 2016 18:45:22 +0000 (18:45 +0000)]
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev

7 years agoMerge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc...
Andrii Kulian [Wed, 19 Oct 2016 18:31:33 +0000 (18:31 +0000)]
Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev

7 years agoMerge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:...
Dan Yu [Wed, 19 Oct 2016 18:05:37 +0000 (18:05 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7
am: 8233c03d1e

Change-Id: If0291ee0b6df1c0fb81785b490cdf716ba9cc8b7

7 years agodocs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d
Daniel Yu [Wed, 19 Oct 2016 17:57:11 +0000 (17:57 +0000)]
docs: Updating TIF docs for new TIF Companion library. am: e0810402fb am: f8a8260c0d
am: 9ce21dc769

Change-Id: I1066a9122bab7f3fe620bd23f17adc36559133a4

7 years agoMerge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8
Yang Ni [Wed, 19 Oct 2016 17:52:39 +0000 (17:52 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev am: 6aee6e9ca8
am: 4a9883cdf8

Change-Id: I1a4378d4ec4c5b2e720d81d90d72c5b7fedce261

7 years agoMerge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:...
Dan Yu [Wed, 19 Oct 2016 17:52:35 +0000 (17:52 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6
am: 3aa0ff2de7

Change-Id: If9e2b5d23f40a5d48906b81f818a2e9b5e8bb24a

7 years agodocs: Updating TIF docs for new TIF Companion library. am: e0810402fb
Daniel Yu [Wed, 19 Oct 2016 17:51:36 +0000 (17:51 +0000)]
docs: Updating TIF docs for new TIF Companion library. am: e0810402fb
am: f8a8260c0d

Change-Id: Ida18c6b46ccff01cb6299b1774fbcc724f54712a

7 years agoUpdated API reference doc for Single-Source RS am: 51f1e93be7
Yang Ni [Wed, 19 Oct 2016 17:51:32 +0000 (17:51 +0000)]
Updated API reference doc for Single-Source RS am: 51f1e93be7
am: 246b0bcc9a

Change-Id: I572709a23a33f0a17ad754221c27a042f9c44f2e

7 years agoMerge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
Dan Yu [Wed, 19 Oct 2016 17:44:48 +0000 (17:44 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
am: dc69de5ac6

Change-Id: I3f49c5fbd2dc9f298cdf0cdd8acc5f49188319d4

7 years agodocs: Updating TIF docs for new TIF Companion library.
Daniel Yu [Wed, 19 Oct 2016 17:44:46 +0000 (17:44 +0000)]
docs: Updating TIF docs for new TIF Companion library.
am: e0810402fb

Change-Id: Ic44c96963d1dd172f07f6564a084ca731bf49762

7 years agoMerge "Updated API reference doc for Single-Source RS" into nyc-dev
Yang Ni [Wed, 19 Oct 2016 17:37:43 +0000 (17:37 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev
am: 6aee6e9ca8

Change-Id: I86ae7b92e3c6bb2202375a990f0203630afa5744

7 years agoUpdated API reference doc for Single-Source RS
Yang Ni [Wed, 19 Oct 2016 17:37:39 +0000 (17:37 +0000)]
Updated API reference doc for Single-Source RS
am: 51f1e93be7

Change-Id: Ie8c820ea2d55b16f66afd53034b69d4c770d17e0

7 years agoMerge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs
Dan Yu [Wed, 19 Oct 2016 17:30:42 +0000 (17:30 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs

7 years agoMerge "Updated API reference doc for Single-Source RS" into nyc-dev
Yang Ni [Wed, 19 Oct 2016 17:25:55 +0000 (17:25 +0000)]
Merge "Updated API reference doc for Single-Source RS" into nyc-dev

7 years agoMerge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev
Andrew Solovay [Wed, 19 Oct 2016 17:06:43 +0000 (17:06 +0000)]
Merge "docs: Updating the samples "what's new" for API 7.1" into nyc-mr1-dev

7 years agoSkip getting transforms for ignored tasks.
Winson [Wed, 19 Oct 2016 16:53:59 +0000 (09:53 -0700)]
Skip getting transforms for ignored tasks.

- If the stack does not contain the existing ignored task view on
  relayout, then we should not try and get the transform for it
  since it will be skipped.

Bug: 32001762
Change-Id: I23182c76ac41b036c25edf92374622191e9d4ce3

7 years agoBluetooth: More logging of bluetooth service state
Marie Janssen [Tue, 18 Oct 2016 17:04:24 +0000 (10:04 -0700)]
Bluetooth: More logging of bluetooth service state

Bug: 32140251
Bug: 32140271
Bug: 32060415

Change-Id: I50faa184551748023ea5a573646a75293f553d16

7 years agoMerge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev
Svetoslav Ganov [Wed, 19 Oct 2016 01:35:33 +0000 (01:35 +0000)]
Merge "[DO NOT MERGE] Catch a missed case when adding a toast" into nyc-mr1-dev

7 years agoMerge "Only purge sound models that violate the new primary key constraint if they...
TreeHugger Robot [Wed, 19 Oct 2016 01:17:02 +0000 (01:17 +0000)]
Merge "Only purge sound models that violate the new primary key constraint if they don't contain identical data." into nyc-mr1-dev

7 years agodocs: Updating the samples "what's new" for API 7.1
Andrew Solovay [Tue, 18 Oct 2016 23:01:21 +0000 (16:01 -0700)]
docs: Updating the samples "what's new" for API 7.1

"What's new" page hadn't been updated since 6.0 (18 months ago).
Replacing the old "new" sample apps with the three new ones added
for 7.1.

Doc is staged to:

http://go/dods-stage/samples/new/

bug: 32212333
Change-Id: Ibb48bb531c0d519e50d940d443b461a215ed87d7

7 years agoMerge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev
Svetoslav Ganov [Wed, 19 Oct 2016 00:32:58 +0000 (00:32 +0000)]
Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev

7 years agoMerge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc
Hemal Patel [Tue, 18 Oct 2016 23:09:58 +0000 (23:09 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev am: b361f519dc
am: 2a2c0fb96a

Change-Id: I52c0fc44767f3b1102a8830e9e7910bf6d0db993

7 years agoDocs: Fixed a broken link am: 9a641b6989
Hemal Patel [Tue, 18 Oct 2016 23:08:56 +0000 (23:08 +0000)]
Docs: Fixed a broken link am: 9a641b6989
am: 40aaf53920

Change-Id: I4888353281c101f92da0ce438e64531739c332be

7 years agoDO NOT MERGE -- Use focused activity value when moving task back
Andrii Kulian [Tue, 18 Oct 2016 20:54:38 +0000 (13:54 -0700)]
DO NOT MERGE -- Use focused activity value when moving task back

When task is moved back we need to adjust currently focused activity
and sent currently resumed record from ActivityStack. However if this
happens when device is locked, resumed activity record will be null.
Need to used currently focused record from service instead.

Bug: 32172829
Change-Id: I2de9bc4135663ab45af859f21e9e92562deb44d4

7 years agoMerge "Docs: Fixed a broken link" into nyc-dev
Hemal Patel [Tue, 18 Oct 2016 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev
am: b361f519dc

Change-Id: I715603d2fe5f7d21b93c663dc7109d4ee5abaf74

7 years agoDocs: Fixed a broken link
Hemal Patel [Tue, 18 Oct 2016 23:01:53 +0000 (23:01 +0000)]
Docs: Fixed a broken link
am: 9a641b6989

Change-Id: If8e166a3cb36d158fd428e314b90cb265cf2256c

7 years agoMerge "Docs: Fixed a broken link" into nyc-dev
Hemal Patel [Tue, 18 Oct 2016 22:54:35 +0000 (22:54 +0000)]
Merge "Docs: Fixed a broken link" into nyc-dev

7 years agodocs: Updated ShortcutManager and ShortcutInfo class references.
Kevin Hufnagle [Sat, 15 Oct 2016 02:04:51 +0000 (19:04 -0700)]
docs: Updated ShortcutManager and ShortcutInfo class references.

Bug: 32074598
Change-Id: I168d49a8542b411a074dc6e9120b0f08f72a829a

7 years agoMerge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 22:46:22 +0000 (22:46 +0000)]
Merge "Fix regression with defaultDisplay adjustments" into nyc-mr1-dev

7 years agoOnly purge sound models that violate the new primary key constraint if
Chris Thornton [Tue, 18 Oct 2016 22:27:00 +0000 (15:27 -0700)]
Only purge sound models that violate the new primary key constraint if
they don't contain identical data.

Bug: 32174118
Change-Id: Ied5e4e852337e5f819c7ded53dd941d79087ce73

7 years agoMerge "Separate ambient display triggers" into nyc-mr1-dev
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev

7 years agoMerge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 21:27:44 +0000 (21:27 +0000)]
Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev

7 years agoMerge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Fix race with Asset destruction and printing allocation stats" into nyc-mr1-dev

7 years ago[DO NOT MERGE] Catch a missed case when adding a toast
Svetoslav Ganov [Tue, 18 Oct 2016 01:41:48 +0000 (18:41 -0700)]
[DO NOT MERGE] Catch a missed case when adding a toast

We allow a single toast window per UID. It is possible that
the UID had another toast window that is going away and this
CL adds a missed check for when a window is scheduled to be
removed.

bug:31340854

Change-Id: I0621516019542c85fe7121f7fe61659e4d4eb672

7 years agoFix regression with defaultDisplay adjustments
Adam Lesinski [Tue, 18 Oct 2016 19:58:27 +0000 (12:58 -0700)]
Fix regression with defaultDisplay adjustments

ag/1542219 introduced a regression where if the display was the default
display, the configuration would still be adjusted as if it were
a non-default display. This fixes that logic to only adjust the
configuration if the display is non-default.

Bug:32133693
Test: cts-tradefed run cts --module CtsServicesHostTestCases --test android.server.cts.ActivityManagerAppConfigurationTests#testConfigurationUpdatesWhenRotatingToSideFromDocked
Change-Id: Ib2fda8c1651609efa9d20b3e2dace8a122864916

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 18:39:48 +0000 (18:39 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours am: ec44540d42 am: 583a7017ce  -s ours am: 8c94179f51 am: 336791758a am: 43222cec43 am: e7adcdd082  -s ours am: ac12204cd3
am: f134b88684

Change-Id: I80bb9d7fb4e9a00abab35af04f64f21f9c8675e9

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 18:33:13 +0000 (18:33 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours am: ec44540d42 am: 583a7017ce  -s ours am: 8c94179f51 am: 336791758a am: 43222cec43 am: e7adcdd082  -s ours
am: ac12204cd3

Change-Id: I1faab603c76031b48b4fa6560c67fae4e3247e31

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 18:26:41 +0000 (18:26 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours am: 02cd808ab8 am: 8e2451759d  -s ours am: 9cf942973d am: 25cbc1b7ec am: 78cc05eebe am: a787a575b1  -s ours am: 88a5b7e919
am: 1342dca30f

Change-Id: I1c5b083fa5dfdb6c7b1333829c917f2075dc66ce

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 18:26:35 +0000 (18:26 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours am: ec44540d42 am: 583a7017ce  -s ours am: 8c94179f51 am: 336791758a am: 43222cec43
am: e7adcdd082  -s ours

Change-Id: I2903eae7d1334282e9f2fdb04a7970e1bc423c02

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 18:20:27 +0000 (18:20 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours am: 02cd808ab8 am: 8e2451759d  -s ours am: 9cf942973d am: 25cbc1b7ec am: 78cc05eebe am: a787a575b1  -s ours
am: 88a5b7e919

Change-Id: Ibffc1f2ab709556898c1b391b28614175677d430

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d...
Sungsoo [Tue, 18 Oct 2016 18:20:17 +0000 (18:20 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a  -s ours am: 8be090868e am: 69febedd6d am: a1f70f7056 am: ef874e34b9  -s ours am: c4b72e5f1d
am: 7fd5f3d2a3

Change-Id: I7a7dd7b99934dbd0e0150ca2b89e8458f6133fde

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 18:20:01 +0000 (18:20 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours am: ec44540d42 am: 583a7017ce  -s ours am: 8c94179f51 am: 336791758a
am: 43222cec43

Change-Id: Iaea2cf175368efe32934a14d5717fe2069c1ce99

7 years agoMerge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev
Andy Hung [Tue, 18 Oct 2016 18:14:59 +0000 (18:14 +0000)]
Merge "Ringtone: clear the MediaPlayer listener upon completion" into nyc-mr1-dev

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d...
Sungsoo [Tue, 18 Oct 2016 18:14:10 +0000 (18:14 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a  -s ours am: 8be090868e am: 69febedd6d am: a1f70f7056 am: ef874e34b9  -s ours
am: c4b72e5f1d

Change-Id: Iae5fe5b1b113ee2b395d0784f3223ab5f7089cd9

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 18:14:03 +0000 (18:14 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours am: 02cd808ab8 am: 8e2451759d  -s ours am: 9cf942973d am: 25cbc1b7ec am: 78cc05eebe
am: a787a575b1  -s ours

Change-Id: I9a3ed1ceeb98c70c0dc49ad3278f05f194cdd385

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 18:13:55 +0000 (18:13 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours am: ec44540d42 am: 583a7017ce  -s ours am: 8c94179f51
am: 336791758a

Change-Id: I7aba59c53b9fbeb6d58d139d730cdb13af78d6bb

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077...
Sungsoo [Tue, 18 Oct 2016 18:07:43 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710 am: 802632d4a8  -s ours am: 6eea6bbb5a
am: 6e6bb933ae

Change-Id: I2210d4a29a515e3ff6b653d03051e213b209d7c6

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d...
Sungsoo [Tue, 18 Oct 2016 18:07:24 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a  -s ours am: 8be090868e am: 69febedd6d am: a1f70f7056
am: ef874e34b9  -s ours

Change-Id: I57497969a54d7491db6ba7e585ea95e363d2f6dd

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 18:07:22 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours am: 02cd808ab8 am: 8e2451759d  -s ours am: 9cf942973d am: 25cbc1b7ec
am: 78cc05eebe

Change-Id: I5a0930994d7fcd0e130d8127d2107effcd29d02d

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 18:07:19 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours am: ec44540d42 am: 583a7017ce  -s ours
am: 8c94179f51

Change-Id: I8abecc3855c2dd92fbf25717bd56481dd1ee37ea

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 18:00:54 +0000 (18:00 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours am: ec44540d42
am: 583a7017ce  -s ours

Change-Id: I39976fd7bf943dd9b4e38c084270c977cf0511ca

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 18:00:45 +0000 (18:00 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours am: 02cd808ab8 am: 8e2451759d  -s ours am: 9cf942973d
am: 25cbc1b7ec

Change-Id: Ie8e3cfffd550c15b8d43d59539962d07934e76a3

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d...
Sungsoo [Tue, 18 Oct 2016 17:56:13 +0000 (17:56 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a  -s ours am: 8be090868e am: 69febedd6d
am: a1f70f7056

Change-Id: I9ac60876e36d651e3aec597d4d6a396041877e98

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077...
Sungsoo [Tue, 18 Oct 2016 17:55:56 +0000 (17:55 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710 am: 802632d4a8  -s ours
am: 6eea6bbb5a

Change-Id: If9505274f0a5e0cf42909d450320e30a19766265

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 17:54:57 +0000 (17:54 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours am: 21c4e6d532  -s ours
am: ec44540d42

Change-Id: Id4fd3422c443d5e7363d3ff27b2ba0eeb532f1dd

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077...
Sungsoo [Tue, 18 Oct 2016 17:48:04 +0000 (17:48 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710
am: 802632d4a8  -s ours

Change-Id: Ic5bcd58df094c76a640197bc0e39f007617911b3

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d...
Sungsoo [Tue, 18 Oct 2016 17:47:59 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a  -s ours am: 8be090868e
am: 69febedd6d

Change-Id: Id1c70a1131d860d027fed915088918232899f026

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 17:47:58 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184  -s ours
am: 21c4e6d532  -s ours

Change-Id: Ibf02e62ee13accd5d204c44faeb6aa8c05afb709

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 17:47:56 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours am: 02cd808ab8 am: 8e2451759d  -s ours
am: 9cf942973d

Change-Id: Ice1c96b49f7350a41cf35779f0f1fb06f6ff0c77

7 years agoSeparate ambient display triggers
Adrian Roos [Fri, 14 Oct 2016 20:03:45 +0000 (13:03 -0700)]
Separate ambient display triggers

Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.

Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work

7 years agoExifInterfaceTest: Catch IOException am: c9ed3b8a5b
Sungsoo [Tue, 18 Oct 2016 17:42:01 +0000 (17:42 +0000)]
ExifInterfaceTest: Catch IOException am: c9ed3b8a5b
am: a4ec9714b3

Change-Id: I32a0cd6b1a58a697f108f37e0f036e55c9df9e17

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba...
Sungsoo [Tue, 18 Oct 2016 17:41:55 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e
am: 9a15881184  -s ours

Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 17:41:49 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours am: 02cd808ab8
am: 8e2451759d  -s ours

Change-Id: Id0d69d1bddcf0d6059b53bd3a4b2b55df493899c

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077...
Sungsoo [Tue, 18 Oct 2016 17:41:48 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6
am: e31a44b710

Change-Id: I6d56c9db2085bf7b14a3a82184ce0efe77479871

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d...
Sungsoo [Tue, 18 Oct 2016 17:41:45 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a  -s ours
am: 8be090868e

Change-Id: I9e9954d2d058b6552d4d9900df51a4050a90c1fe

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba
Sungsoo [Tue, 18 Oct 2016 17:35:23 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba
am: a5affb045e

Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d
Sungsoo [Tue, 18 Oct 2016 17:35:22 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d
am: 41b775b40a  -s ours

Change-Id: I6ce63b74988fb4f87565be611a47c2f4a28cbc9b

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077
Sungsoo [Tue, 18 Oct 2016 17:35:20 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077
am: 761a1ed3a6

Change-Id: Ia6679d76895a452267f23dd71096c397c5b48c88

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5...
Sungsoo [Tue, 18 Oct 2016 17:35:16 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5  -s ours
am: 02cd808ab8

Change-Id: Ic14a5adecb6fb0732a5b3c2a68a28fdcf1eb1bc4

7 years agoExifInterfaceTest: Catch IOException
Sungsoo [Tue, 18 Oct 2016 17:31:12 +0000 (17:31 +0000)]
ExifInterfaceTest: Catch IOException
am: c9ed3b8a5b

Change-Id: I589c7be846a9043ab0a7bbfb5e7775e9e595c0fd

7 years agoMerge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 17:29:43 +0000 (17:29 +0000)]
Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 17:29:03 +0000 (17:29 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: 135524f2c5  -s ours

Change-Id: I34fc1b37171ad6ea5d79035df6c4730260a0b47b

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 17:29:00 +0000 (17:29 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: cb17930077

Change-Id: I4b8f9270f75800e1390c3a840b41316c20ea4aa8

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 17:28:58 +0000 (17:28 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: 418e0869ba

Change-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 17:28:58 +0000 (17:28 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: ad74e88f1d

Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229

7 years agoMerge "DirectReply: fix lockscreen crash" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 16:59:24 +0000 (16:59 +0000)]
Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev

7 years agoExifInterfaceTest: Catch IOException
Sungsoo [Tue, 18 Oct 2016 01:06:01 +0000 (10:06 +0900)]
ExifInterfaceTest: Catch IOException

ExifInterface throws IOException instead of UnsupportedOperationException.

Bug: 32221877
Change-Id: I68a4a62f565a386434b774759271bf6f2af2b7db

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens

Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens

Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens

Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f

7 years agoDO NOT MERGE) ExifInterface: Close the file when an exception happens
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens

Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:57:08 +0000 (05:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev