Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove libexif usage from libmedia_jni.so

Browse Source 
Test: manual, connect with MTP and PTP
Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9
This commit is contained in:
Marco Nelissen
2019-06-27 15:56:32 -07:00
parent a741dca7fc
commit f7ec16802c
3 changed files with 82 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
media/java/android/mtp/MtpDatabase.java
View File

@@ -25,6 +25,7 @@ import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.media.ExifInterface;
import android.net.Uri;
import android.os.BatteryManager;
import android.os.RemoteException;
@@ -47,6 +48,7 @@ import dalvik.system.CloseGuard;
import com.google.android.collect.Sets;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -798,6 +800,54 @@ public class MtpDatabase implements AutoCloseable {
return obj.getFormat();
}
@VisibleForNative
private boolean getThumbnailInfo(int handle, long[] outLongs) {
MtpStorageManager.MtpObject obj = mManager.getObject(handle);
if (obj == null) {
return false;
}
String path = obj.getPath().toString();
switch (obj.getFormat()) {
case MtpConstants.FORMAT_HEIF:
case MtpConstants.FORMAT_EXIF_JPEG:
case MtpConstants.FORMAT_JFIF:
try {
ExifInterface exif = new ExifInterface(path);
long[] thumbOffsetAndSize = exif.getThumbnailRange();
outLongs[0] = thumbOffsetAndSize != null ? thumbOffsetAndSize[1] : 0;
outLongs[1] = exif.getAttributeInt(ExifInterface.TAG_PIXEL_X_DIMENSION, 0);
outLongs[2] = exif.getAttributeInt(ExifInterface.TAG_PIXEL_Y_DIMENSION, 0);
return true;
} catch (IOException e) {
// ignore and fall through
}
}
return false;
}
@VisibleForNative
private byte[] getThumbnailData(int handle) {
MtpStorageManager.MtpObject obj = mManager.getObject(handle);
if (obj == null) {
return null;
}
String path = obj.getPath().toString();
switch (obj.getFormat()) {
case MtpConstants.FORMAT_HEIF:
case MtpConstants.FORMAT_EXIF_JPEG:
case MtpConstants.FORMAT_JFIF:
try {
ExifInterface exif = new ExifInterface(path);
return exif.getThumbnail();
} catch (IOException e) {
// ignore and fall through
}
}
return null;
}
@VisibleForNative
private int beginDeleteObject(int handle) {
MtpStorageManager.MtpObject obj = mManager.getObject(handle);