From b65349013b2ee185dd7e0793ff6cbcbd76affa3e Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Sat, 2 May 2015 16:44:34 -0700
Subject: Use simpler API to get op package name

Change-Id: I678f5030350d0b795e46bed177e909a81536457f
---
 src/java/android/net/rtp/AudioGroup.java | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/java/android/net/rtp/AudioGroup.java b/src/java/android/net/rtp/AudioGroup.java
index da74bd6..15390d3 100644
--- a/src/java/android/net/rtp/AudioGroup.java
+++ b/src/java/android/net/rtp/AudioGroup.java
@@ -17,7 +17,6 @@
 package android.net.rtp;
 
 import android.app.ActivityThread;
-import android.app.Application;
 import android.media.AudioManager;
 
 import java.util.HashMap;
@@ -154,7 +153,7 @@ public class AudioGroup {
                 long id = nativeAdd(stream.getMode(), stream.getSocket(),
                         stream.getRemoteAddress().getHostAddress(),
                         stream.getRemotePort(), codecSpec, stream.getDtmfType(),
-                        getMyOpPackageName());
+                        ActivityThread.currentOpPackageName());
                 mStreams.put(stream, id);
             } catch (NullPointerException e) {
                 throw new IllegalStateException(e);
@@ -206,15 +205,4 @@ public class AudioGroup {
         nativeRemove(0L);
         super.finalize();
     }
-
-    private static String getMyOpPackageName() {
-        ActivityThread activityThread = ActivityThread.currentActivityThread();
-        if (activityThread != null) {
-            Application application = activityThread.getApplication();
-            if (application != null) {
-                return application.getOpPackageName();
-            }
-        }
-        throw new IllegalStateException("Cannot create AudioRecord outside of an app");
-    }
 }
-- 
cgit v1.2.3