OSDN Git Service

android-x86/frameworks-base.git
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 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

7 years agoDO NOT MERGE: Fix NullPointerException in MtpManager.
Daichi Hirono [Tue, 19 Jul 2016 06:48:04 +0000 (15:48 +0900)]
DO NOT MERGE: Fix NullPointerException in MtpManager.

BUG=30152892

Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
(cherry picked from commit 28e6112e2f2cef5852b20e53382ea717a5a6cd41)

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 18 Oct 2016 05:34:40 +0000 (05:34 +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 [Tue, 18 Oct 2016 05:31:38 +0000 (05:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Oct 2016 04:19:36 +0000 (21:19 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 18 Oct 2016 04:10:43 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE

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

7 years agoRingtone: clear the MediaPlayer listener upon completion
Andy Hung [Tue, 18 Oct 2016 01:02:29 +0000 (18:02 -0700)]
Ringtone: clear the MediaPlayer listener upon completion

This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.

Bug: 31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff

7 years agoMerge "Update primary key in VIS sound model database." into nyc-mr1-dev
TreeHugger Robot [Mon, 17 Oct 2016 22:20:34 +0000 (22:20 +0000)]
Merge "Update primary key in VIS sound model database." into nyc-mr1-dev

7 years agoDirectReply: fix lockscreen crash
Adrian Roos [Mon, 17 Oct 2016 22:08:03 +0000 (15:08 -0700)]
DirectReply: fix lockscreen crash

Fixes a crash that happens when direct reply is triggered and
the view is detached between clicking and unlocking.

Change-Id: I647560a24f9a26a28e86df436b45d5f496454eb8
Fixes: 32171748

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 17 Oct 2016 18:08:03 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE

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

7 years agoFix complex clipping on mergeable ops DO NOT MERGE
Chris Craik [Fri, 14 Oct 2016 22:08:21 +0000 (15:08 -0700)]
Fix complex clipping on mergeable ops DO NOT MERGE

Fixes: 32106003

Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59

7 years agoUpdate primary key in VIS sound model database.
Chris Thornton [Sun, 16 Oct 2016 23:23:29 +0000 (16:23 -0700)]
Update primary key in VIS sound model database.

The public API for getting at KeyphraseSoundModels is based on the user,
locale, and keyphrase ID. However, the sound model database would allow
multiple models to be registered using the same values, as it has a
primary key on the model UUID. This can potentially lead to a scenario
where multiple models are enrolled for the same user, and the data that
is returned when querying models is arbitrary.

V6 of the sound model database now enforces a primary key over the user
ID, locale and keyphrase ID. When inserting a new model with the same
primary key, the old model will be removed and the new model will be
used instead.

When upgrading from V5 to V6, if there are any models that would violate
the primary key constraint, they are all dropped.

Bug: 32174118
Change-Id: I9597c6a994f01a426625c3be2c53e826f26f5156

7 years agoMerge "CEC: Check standby action availability before request for sleep mode" into...
Donghyun Cho [Sun, 16 Oct 2016 03:09:20 +0000 (03:09 +0000)]
Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev

7 years agoMerge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev
Sooraj Sasindran [Sat, 15 Oct 2016 06:34:02 +0000 (06:34 +0000)]
Merge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:58:27 +0000 (01:58 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours am: 0eef6b3ff2 am: 6d7f209964  -s ours am: 5d1bfd9d5f am: 13fdd92274 am: cc63841161 am: eb8bdd6e12  -s ours am: 01e42cf67c
am: f0edbfbe48

Change-Id: If5939a0551fb4101abeb96d183337f1e147edd99

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:57:25 +0000 (01:57 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours am: 7dfd05f0e5 am: 2432cf3645  -s ours am: 99f8b9c2b4 am: f6c384c657 am: a2fe1c2e62 am: c0a7561135  -s ours am: c0294c50e2
am: 3b38e7d663

Change-Id: Iffe525eda50fa8304956a62048711aa1ed797ef3

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:50:08 +0000 (01:50 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours am: 0eef6b3ff2 am: 6d7f209964  -s ours am: 5d1bfd9d5f am: 13fdd92274 am: cc63841161 am: eb8bdd6e12  -s ours
am: 01e42cf67c

Change-Id: I9d3526db7534ae6e64b535748f1fc4c956e0e598

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:49:09 +0000 (01:49 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours am: 7dfd05f0e5 am: 2432cf3645  -s ours am: 99f8b9c2b4 am: f6c384c657 am: a2fe1c2e62 am: c0a7561135  -s ours
am: c0294c50e2

Change-Id: I084aedf0732fedfccdb423b914c069f6a17d45c3

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:41:54 +0000 (01:41 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours am: 0eef6b3ff2 am: 6d7f209964  -s ours am: 5d1bfd9d5f am: 13fdd92274 am: cc63841161
am: eb8bdd6e12  -s ours

Change-Id: Id3574f3acaaeaa0afc597c4b832b0149dc8e19ee

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:40:55 +0000 (01:40 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours am: 7dfd05f0e5 am: 2432cf3645  -s ours am: 99f8b9c2b4 am: f6c384c657 am: a2fe1c2e62
am: c0a7561135  -s ours

Change-Id: Ibb3d9fbb49ace0cd5d1d5fa62e754f1340dc5d95

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:34:14 +0000 (01:34 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours am: 0eef6b3ff2 am: 6d7f209964  -s ours am: 5d1bfd9d5f am: 13fdd92274
am: cc63841161

Change-Id: I888c0836f2b9d481ebf5e3cb7bed6692810bc919

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:33:19 +0000 (01:33 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours am: 7dfd05f0e5 am: 2432cf3645  -s ours am: 99f8b9c2b4 am: f6c384c657
am: a2fe1c2e62

Change-Id: I893c299b54529b29ddc701071cb5f806e92705b8

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:27:23 +0000 (01:27 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0  -s ours am: 40a13c5917 am: 0645127e25  -s ours am: 3da33f8bb0 am: efbb0d6db3 am: b2467b6158 am: 6b903b9299  -s ours am: ef6363cec7
am: f2a0598b8d

Change-Id: Idc484efc157e66f093d983e7bd742af61580acb6

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:26:36 +0000 (01:26 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours am: 0eef6b3ff2 am: 6d7f209964  -s ours am: 5d1bfd9d5f
am: 13fdd92274

Change-Id: Id6ee67119933051f4e1f6f40f6d1c979f3714257

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee...
Suprabh Shukla [Sat, 15 Oct 2016 01:26:16 +0000 (01:26 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2  -s ours am: 8d124e37f1 am: 56b525a313  -s ours am: 250e86a01d am: b8a7dcde9b am: 9755a217a2 am: 128ccbca9a  -s ours am: 18cfcf8c8a
am: 804c9dee98

Change-Id: Iffab1677a588e6a39b93fb63637555bb6dc8ff79

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:25:36 +0000 (01:25 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours am: 7dfd05f0e5 am: 2432cf3645  -s ours am: 99f8b9c2b4
am: f6c384c657

Change-Id: Ic30f0de82d7b3486a6ac43ed38487935fc97db15

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:25:22 +0000 (01:25 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a am: 851fd50a07  -s ours am: 690f73f1a1
am: bba4dc9556

Change-Id: Ia56573cec4c0d25104f2ad2bb04b7b62d04890fe

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:22:13 +0000 (01:22 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours am: 0eef6b3ff2 am: 6d7f209964  -s ours
am: 5d1bfd9d5f

Change-Id: I7b50c1509c99f68908a670f0e346bb4b1b848dc5

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:20:32 +0000 (01:20 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0  -s ours am: 40a13c5917 am: 0645127e25  -s ours am: 3da33f8bb0 am: efbb0d6db3 am: b2467b6158 am: 6b903b9299  -s ours
am: ef6363cec7

Change-Id: I9cf4a3137800fb4a0c52df4ac26ebf564d86b26a

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee...
Suprabh Shukla [Sat, 15 Oct 2016 01:19:41 +0000 (01:19 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2  -s ours am: 8d124e37f1 am: 56b525a313  -s ours am: 250e86a01d am: b8a7dcde9b am: 9755a217a2 am: 128ccbca9a  -s ours
am: 18cfcf8c8a

Change-Id: Ic1d2301177b7a21c1a9a177b96c3d0327cd0d13f

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:18:37 +0000 (01:18 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a am: 851fd50a07  -s ours
am: 690f73f1a1

Change-Id: I019ff64d70b7e2f4b7f2f9f6bc12c41a3928eccd

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:18:24 +0000 (01:18 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours am: 0eef6b3ff2
am: 6d7f209964  -s ours

Change-Id: Iff979c99a7aff3e68740052c49b7850275839965

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:18:22 +0000 (01:18 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours am: 7dfd05f0e5 am: 2432cf3645  -s ours
am: 99f8b9c2b4

Change-Id: Ie5f386f3f17370449de23fc8f3bfb8c7a1881495

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:12:17 +0000 (01:12 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0  -s ours am: 40a13c5917 am: 0645127e25  -s ours am: 3da33f8bb0 am: efbb0d6db3 am: b2467b6158
am: 6b903b9299  -s ours

Change-Id: Idbf393dc6904919b0b4191d1f62ec9fa4d8ce560

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee...
Suprabh Shukla [Sat, 15 Oct 2016 01:11:19 +0000 (01:11 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2  -s ours am: 8d124e37f1 am: 56b525a313  -s ours am: 250e86a01d am: b8a7dcde9b am: 9755a217a2
am: 128ccbca9a  -s ours

Change-Id: I6614990569e9270b977212f2435bb23cd86e658f

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:10:39 +0000 (01:10 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours am: 7dfd05f0e5
am: 2432cf3645  -s ours

Change-Id: Icbc41a48fbd9cc8f1c7423c96cac5730a52a78c9

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:10:20 +0000 (01:10 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a
am: 851fd50a07  -s ours

Change-Id: Ie35fe5f230b63840b1e814563a25b484e2541fc9

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:10:15 +0000 (01:10 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours am: 5bea7d3aee  -s ours
am: 0eef6b3ff2

Change-Id: Ia5e16b194bb3af63506557c88ef2f5077dc58000

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 01:07:35 +0000 (01:07 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8 am: 3fa004554c am: 8169e87f25  -s ours am: a026501af8
am: e3b8d697cc

Change-Id: Ib5654a50f8f1f71866ec3fce7998b4a830c43052

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f...
Christopher Tate [Sat, 15 Oct 2016 01:06:47 +0000 (01:06 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9 am: f93e1f2671 am: 7044826aa8 am: 25c278dcbf  -s ours am: db3446aa0f
am: 73549cb683

Change-Id: I39071b3e3e336ee4888a8a60d84a454a74f8c023

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 01:04:58 +0000 (01:04 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0  -s ours am: 40a13c5917 am: 0645127e25  -s ours am: 3da33f8bb0 am: efbb0d6db3
am: b2467b6158

Change-Id: I4cc148ab6e8ba6afa3d31fffb68ad5a56effe5fa

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 01:04:39 +0000 (01:04 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours am: 9c78d0ad9f  -s ours
am: 7dfd05f0e5

Change-Id: Icfcde7dc91379a4e69d688501a0c46797b212103

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee...
Suprabh Shukla [Sat, 15 Oct 2016 01:04:03 +0000 (01:04 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2  -s ours am: 8d124e37f1 am: 56b525a313  -s ours am: 250e86a01d am: b8a7dcde9b
am: 9755a217a2

Change-Id: I6a1390fccda8566b518f78b0769977e26e588864

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 01:03:09 +0000 (01:03 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8 am: f2e19dd663
am: 5a4af6ab3a

Change-Id: Ifceb850f264e7cb11c5d7cedf84afd38cbf7f529

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 01:02:02 +0000 (01:02 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8 am: 3fa004554c am: 8169e87f25  -s ours
am: a026501af8

Change-Id: If07e3204c6667f5bd2a91a78bb82a02fba8a4bf7

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f...
Christopher Tate [Sat, 15 Oct 2016 01:01:09 +0000 (01:01 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9 am: f93e1f2671 am: 7044826aa8 am: 25c278dcbf  -s ours
am: db3446aa0f

Change-Id: I53cfc5839b1fd8a8bb8ed892ebba4165000c695e

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 00:59:41 +0000 (00:59 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea  -s ours
am: 5bea7d3aee  -s ours

Change-Id: If66e50ff4d2f4c1b91ed3204d7a11000429489d5

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 00:58:28 +0000 (00:58 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0  -s ours am: 40a13c5917 am: 0645127e25  -s ours am: 3da33f8bb0
am: efbb0d6db3

Change-Id: Id1d55253fc4203161467ee9018d514211afd484e

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee...
Suprabh Shukla [Sat, 15 Oct 2016 00:57:34 +0000 (00:57 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2  -s ours am: 8d124e37f1 am: 56b525a313  -s ours am: 250e86a01d
am: b8a7dcde9b

Change-Id: I54cdd478bb2edcf6e9948d0f3e9e60372e1793ea

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 190e66...
Christopher Tate [Sat, 15 Oct 2016 00:56:44 +0000 (00:56 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf  -s ours am: 1d86a376c8
am: f2e19dd663

Change-Id: Iab8084402119c914bfe8debe806bbad946da11f1

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5...
Suprabh Shukla [Sat, 15 Oct 2016 00:56:40 +0000 (00:56 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78  -s ours
am: 9c78d0ad9f  -s ours

Change-Id: I6e82648a135bd8ae17337eb97518eb8856d065e0

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Christopher Tate [Sat, 15 Oct 2016 00:53:48 +0000 (00:53 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8 am: 3fa004554c
am: 8169e87f25  -s ours

Change-Id: I79a7115d516c57a3ea3ed765c4899a750b2ed293

7 years agoDO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f...
Christopher Tate [Sat, 15 Oct 2016 00:52:46 +0000 (00:52 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am: f4d23f30c9 am: f93e1f2671 am: 7044826aa8
am: 25c278dcbf  -s ours

Change-Id: I660aeed03a70fa359374e86fd413dd216d5b061e

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 00:50:25 +0000 (00:50 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0  -s ours am: 40a13c5917 am: 0645127e25  -s ours
am: 3da33f8bb0

Change-Id: I3ed0137173331704a30a0fa9702a5298a9877b70

7 years agoMerge "DO NOT MERGE Isolated processes don't get precached system service binders...
Suprabh Shukla [Sat, 15 Oct 2016 00:49:46 +0000 (00:49 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a
am: e3c0c509ea  -s ours

Change-Id: I287e60913bd2a3f6b46d1d5ef2413727e3e63cc2