Revert "Split Stk into a client apk and a lib."

This reverts commit f17bb5778ab1678601cfb171eec7213de63bbefc.

Reason for revert: b/148821604

Merged-in: I9f5682f99c73c447a5af8d29ed662f1bd68a0bf6
Change-Id: Idac4e818cbe54b417932603585540f1fd63c503e

1 files changed, 110 insertions, 4 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1a6af77..c49ff86 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,10 +16,116 @@
 
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.stk.lib">
+        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+        package="com.android.stk"
+        android:sharedUserId="android.uid.phone">
 
-    <application>
-        <library android:name="com.android.stk.lib" />
-    </application>
+    <original-package android:name="com.android.stk" />
+
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.GET_TASKS"/>
+    <uses-permission android:name="android.permission.RECEIVE_STK_COMMANDS" />
+    <uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER" />
+    <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
+    <uses-permission android:name="android.permission.USER_ACTIVITY" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application android:icon="@drawable/ic_launcher_sim_toolkit"
+        android:label="@string/app_name"
+        android:clearTaskOnLaunch="true"
+        android:process="com.android.phone"
+        android:taskAffinity="android.task.stk"
+        android:defaultToDeviceProtectedStorage="true"
+        android:directBootAware="true">
+
+        <activity android:name="StkMain"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:label="@string/app_name"
+            android:enabled="false"
+            android:exported="true"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="StkLauncherActivity"
+            android:theme="@android:style/Theme.DeviceDefault.DayNight"
+            android:label="@string/app_name"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+            <intent-filter>
+                 <action android:name="android.intent.action.VIEW" />
+                 <action android:name="android.intent.action.PICK" />
+                 <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="StkMenuActivity"
+            android:theme="@android:style/Theme.DeviceDefault.DayNight"
+            android:icon="@drawable/ic_launcher_sim_toolkit"
+            android:label="@string/app_name"
+            android:configChanges="orientation|locale|screenSize|keyboardHidden|mnc|mcc"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
+        <activity android:name="StkInputActivity"
+            android:label="@string/app_name"
+            android:icon="@drawable/ic_launcher_sim_toolkit"
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
+            android:configChanges="orientation|locale|screenSize|keyboardHidden"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+                <intent-filter>
+                        <action android:name="android.intent.action.VIEW" />
+                        <action android:name="android.intent.action.EDIT" />
+                        <category android:name="android.intent.category.DEFAULT" />
+                </intent-filter>
+        </activity>
+        <activity android:name="StkDialogActivity"
+            android:configChanges="orientation|locale|screenSize|keyboardHidden"
+            android:theme="@style/Transparent"
+            android:exported="false"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+        </activity>
+
+        <activity android:name="ToneDialog"
+            android:exported="false"
+            android:theme="@style/Transparent"
+            android:autoRemoveFromRecents="true"
+            android:taskAffinity="android.task.stk.StkLauncherActivity">
+        </activity>
+
+        <receiver android:name="com.android.stk.StkCmdReceiver">
+            <intent-filter>
+                <action android:name= "com.android.internal.stk.command" />
+                <action android:name= "com.android.internal.stk.session_end" />
+                <action android:name= "com.android.internal.stk.icc_status_change" />
+                <action android:name= "com.android.internal.stk.alpha_notify" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.android.stk.BootCompletedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.USER_INITIALIZE" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name="StkAppService" />
+
+    </application>
 </manifest>