diff options
| author | Julian Veit <claymore1298@gmail.com> | 2022-03-20 00:06:45 +0100 |
|---|---|---|
| committer | Julian Veit <claymore1298@gmail.com> | 2022-03-20 00:06:45 +0100 |
| commit | d250e4a60f3b6219c6925534629eee12834a92b8 (patch) | |
| tree | 52fb90369927e24dc962b6ec283f6a3f710f7a6c /src/com/android/camera/app | |
| parent | ef111dceb9e3fce395bff4f6a4ef1591c701e80c (diff) | |
| parent | 8c444160bd565319468cce5bfdcfc11d20e8b7cb (diff) | |
Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1
Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5
Diffstat (limited to 'src/com/android/camera/app')
| -rw-r--r-- | src/com/android/camera/app/CameraApp.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/app/PlaceholderManager.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java index ef36f2656..dc5825cb1 100644 --- a/src/com/android/camera/app/CameraApp.java +++ b/src/com/android/camera/app/CameraApp.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.app.Application; import android.content.Context; +import com.android.camera.SDCard; import com.android.camera.util.CameraUtil; import com.android.camera.util.UsageStatistics; import com.android.camera.SettingsManager; @@ -44,6 +45,7 @@ public class CameraApp extends Application { SettingsManager.createInstance(this); UsageStatistics.initialize(this); CameraUtil.initialize(this); + SDCard.initialize(this); } public static Context getContext() { diff --git a/src/com/android/camera/app/PlaceholderManager.java b/src/com/android/camera/app/PlaceholderManager.java index e9a99a6b1..326f0be80 100644 --- a/src/com/android/camera/app/PlaceholderManager.java +++ b/src/com/android/camera/app/PlaceholderManager.java @@ -147,7 +147,8 @@ public class PlaceholderManager implements ImageTaskManager { } Uri uri = - Storage.addImage(mContext, null, null, null, PLACEHOLDER_MIME_TYPE); + Storage.addImage(mContext.getContentResolver(), title, timestamp, null, 0, null, + placeholder, width, height, PLACEHOLDER_MIME_TYPE); if (uri == null) { return null; @@ -166,7 +167,7 @@ public class PlaceholderManager implements ImageTaskManager { public void replacePlaceholder(Session session, Location location, int orientation, ExifInterface exif, byte[] jpeg, int width, int height, String mimeType) { - Storage.updateImage(session.outputUri, mContext, session.outputTitle, + Storage.updateImage(session.outputUri, mContext.getContentResolver(), session.outputTitle, session.time, location, orientation, exif, jpeg, width, height, mimeType); synchronized (mListenerRefs) { |