Commit Graph

253881 Commits

Author SHA1 Message Date
Sungsoo
8c94179f51 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
2016-10-18 18:00:54 +00:00
Sungsoo
78cc05eebe 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
2016-10-18 18:00:45 +00:00
Sungsoo
ef874e34b9 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
2016-10-18 17:56:13 +00:00
Sungsoo
6e6bb933ae 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
2016-10-18 17:55:56 +00:00
Sungsoo
583a7017ce 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
2016-10-18 17:54:57 +00:00
Sungsoo
6eea6bbb5a DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6 am: e31a44b710
am: 802632d4a8  -s ours

Change-Id: Ic5bcd58df094c76a640197bc0e39f007617911b3
2016-10-18 17:48:04 +00:00
Sungsoo
a1f70f7056 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours am: 8be090868e
am: 69febedd6d

Change-Id: Id1c70a1131d860d027fed915088918232899f026
2016-10-18 17:47:59 +00:00
Sungsoo
ec44540d42 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
2016-10-18 17:47:58 +00:00
Sungsoo
25cbc1b7ec 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
2016-10-18 17:47:56 +00:00
Adrian Roos
b7e4e10618 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
2016-10-18 10:43:44 -07:00
Sungsoo
b6f40a84fa ExifInterfaceTest: Catch IOException am: c9ed3b8a5b
am: a4ec9714b3

Change-Id: I32a0cd6b1a58a697f108f37e0f036e55c9df9e17
2016-10-18 17:42:01 +00:00
Sungsoo
21c4e6d532 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e
am: 9a15881184  -s ours

Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8
2016-10-18 17:41:55 +00:00
Sungsoo
9cf942973d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8
am: 8e2451759d  -s ours

Change-Id: Id0d69d1bddcf0d6059b53bd3a4b2b55df493899c
2016-10-18 17:41:49 +00:00
Sungsoo
802632d4a8 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077 am: 761a1ed3a6
am: e31a44b710

Change-Id: I6d56c9db2085bf7b14a3a82184ce0efe77479871
2016-10-18 17:41:48 +00:00
Sungsoo
69febedd6d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours
am: 8be090868e

Change-Id: I9e9954d2d058b6552d4d9900df51a4050a90c1fe
2016-10-18 17:41:45 +00:00
Sungsoo
9a15881184 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba
am: a5affb045e

Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680
2016-10-18 17:35:23 +00:00
Sungsoo
8be090868e DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d
am: 41b775b40a  -s ours

Change-Id: I6ce63b74988fb4f87565be611a47c2f4a28cbc9b
2016-10-18 17:35:22 +00:00
Sungsoo
e31a44b710 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: cb17930077
am: 761a1ed3a6

Change-Id: Ia6679d76895a452267f23dd71096c397c5b48c88
2016-10-18 17:35:20 +00:00
Sungsoo
8e2451759d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours
am: 02cd808ab8

Change-Id: Ic14a5adecb6fb0732a5b3c2a68a28fdcf1eb1bc4
2016-10-18 17:35:16 +00:00
Sungsoo
a4ec9714b3 ExifInterfaceTest: Catch IOException
am: c9ed3b8a5b

Change-Id: I589c7be846a9043ab0a7bbfb5e7775e9e595c0fd
2016-10-18 17:31:12 +00:00
TreeHugger Robot
dd443a0548 Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev 2016-10-18 17:29:45 +00:00
Sungsoo
02cd808ab8 DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: 135524f2c5  -s ours

Change-Id: I34fc1b37171ad6ea5d79035df6c4730260a0b47b
2016-10-18 17:29:03 +00:00
Sungsoo
761a1ed3a6 DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: cb17930077

Change-Id: I4b8f9270f75800e1390c3a840b41316c20ea4aa8
2016-10-18 17:29:00 +00:00
Sungsoo
a5affb045e DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: 418e0869ba

Change-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322
2016-10-18 17:28:58 +00:00
Sungsoo
41b775b40a DO NOT MERGE) ExifInterface: Close the file when an exception happens
am: ad74e88f1d

Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229
2016-10-18 17:28:58 +00:00
TreeHugger Robot
fe7cab6042 Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev 2016-10-18 16:59:27 +00:00
Sungsoo
c9ed3b8a5b ExifInterfaceTest: Catch IOException
ExifInterface throws IOException instead of UnsupportedOperationException.

Bug: 32221877
Change-Id: I68a4a62f565a386434b774759271bf6f2af2b7db
2016-10-19 01:26:37 +09:00
Sungsoo
ad74e88f1d DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:18:35 +00:00
Sungsoo
135524f2c5 DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:18:15 +00:00
Sungsoo
418e0869ba DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-18 16:17:29 +00:00
Sungsoo
cb17930077 DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
2016-10-19 01:14:51 +09:00
TreeHugger Robot
92bd012829 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-18 05:57:11 +00:00
Daichi Hirono
9c8e0f1a54 DO NOT MERGE: Fix NullPointerException in MtpManager.
BUG=30152892

Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
(cherry picked from commit 28e6112e2f)
2016-10-18 14:42:28 +09:00
TreeHugger Robot
61058919ca Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-18 05:34:43 +00:00
TreeHugger Robot
e8dc857c2f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-18 05:31:41 +00:00
Bill Yi
ad231bd2f8 Import translations. DO NOT MERGE
Change-Id: I551e9cc3ac74b6a488f0bcc32da9905b7d313f5f
Auto-generated-cl: translation import
2016-10-17 21:19:36 -07:00
Bill Yi
c5a1d40bf1 Import translations. DO NOT MERGE
Change-Id: I49725d38064efcb1f95e204a0ab805f8f6eed550
Auto-generated-cl: translation import
2016-10-17 21:10:43 -07:00
Svet Ganov
96b9c75cec Validate input for ContentService#setIsSyncable
The syncable parameter value cannot be set to
SYNCABLE_NO_ACCOUNT_ACCESS which is a synthetic state that
is computed but never persisted. It just means that the sync
adapter cannot access the account regardless of its current
syncable state and we want to keep its current syncable state
to start from there once account access is granted.

bug:31794527

Change-Id: I606c4b517977d0b0d3e7ffe753dfd235a875fcd7
2016-10-18 02:51:15 +00:00
Adam Lesinski
2582465bb4 Fix race with Asset destruction and printing allocation stats
A race could occur when printing the list of Asset allocations for
debugging purposes.

Each Asset object would insert themselves into a global linked list
on construction and remove themselves on destruction. Iterating the list
and the insertion/remove operations all acquire a global lock.

The race occurs after the Asset subclass destructor runs but before the Asset
base class destructor runs, which performs the actual removal from the list.

The vtable of the object being destroyed ends up pointing at the base Asset class'
vtable, and during the iteration of the global list, a pure virtual method is called
leading to an abort, since the wrong vtable is dereferenced.

This change moves the insertion/removal of the Asset object into the global list
to the concrete class, which adds some maintenance overhead but solves the problem.

Bug:31113965
Test: make libandroidfw_tests
Change-Id: I1a620897e5e04a8519ee247883bba0719b1fa6f3
(cherry picked from commit 0358efe4f7)
2016-10-18 01:27:39 +00:00
Andy Hung
ffe502bd61 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
2016-10-17 18:12:35 -07:00
Tyler Gunn
2282bb97e7 Framework fixes to support VoLTE conf calls via RemoteConnectionServices.
Fixing some issues with the addExistingConnection and addConference APIs
on ConnectionService.  When a connection manager relays the addition of
an existing connection or a conference to Telecom, it will assign a new
ID to the new connection/conference.  Due to how RemoteCSes work, the
Connection/Conf will be added directly via TelephonyConnectionService and
also via the connection manager's connection service.  Because the ID
changes, we ended up adding these twice. Conferences weren't a problem in
the GSM conference case because the TElephonyConnectionService's
ConnectionServiceWrapper didn't know of the IDs for the children of the
conference.  However, due to how the existing connections work its not the
case for VoLTE conferences.  To mitigate this, I'm passing the original
connection/conference ID to the connection manager via extras (ugh) and
using this to ensure that when the new existing connection/conference is
added to telecom that the same ID is used.  This ensures that we can
properly de-dupe the requests from TelephonyConnectionService and the
connection manager.

Also, there was some missing code in RemoteConnectionService which would
cause it to not properly track existing connections.

Bug: 31464792
Change-Id: I436f4438fd000ea48ebea7ceb75105bd3f456e46
2016-10-17 15:48:19 -07:00
TreeHugger Robot
c81e1f15d2 Merge "Update primary key in VIS sound model database." into nyc-mr1-dev 2016-10-17 22:20:38 +00:00
Adrian Roos
b22665db0c 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
2016-10-17 15:08:15 -07:00
Fan Zhang
6acb76621d Catch NPE on network state and fall back to empty summary.
Bug: 32171456
Change-Id: Ia3c1e1f5b7848ec914be9f92401a02b50df1dc57
2016-10-17 12:40:03 -07:00
Bill Yi
c11e301ca4 Import translations. DO NOT MERGE
Change-Id: I8ed7b626ec4169f9154a18daffe36160b8f3dacb
Auto-generated-cl: translation import
2016-10-17 11:08:03 -07:00
Chris Craik
d183e0b988 Fix complex clipping on mergeable ops DO NOT MERGE
Fixes: 32106003

Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59
2016-10-17 10:51:11 -07:00
Chris Thornton
5bd5cf75e1 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
2016-10-17 10:12:04 -07:00
Donghyun Cho
c00a6cb9c3 Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev 2016-10-16 03:09:23 +00:00
Sooraj Sasindran
742b0a7d12 Merge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev 2016-10-15 06:34:05 +00:00
Suprabh Shukla
70508a1961 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
2016-10-15 01:58:27 +00:00