From ba3c8edc2ff9e1449d7392bc9ce80e0ca1074007 Mon Sep 17 00:00:00 2001
From: daqi <daqi@xiaomi.com>
Date: Sat, 17 Jun 2017 15:24:44 +0800
Subject: [PATCH] resolve merge conflicts of 31a2f413f8 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6
---
 .../android/settings/applications/PremiumSmsAccess.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java
index 2b0942f2c61..d220a46041e 100644
--- a/src/com/android/settings/applications/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/PremiumSmsAccess.java
@@ -77,6 +77,13 @@ public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Cal
         super.onPause();
     }
 
+    @Override
+    public void onDestroy() {
+        mSmsBackend.release();
+        mSession.release();
+        super.onDestroy();
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS;