Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions claimManagement/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,35 @@
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- CSU: media/photos access is intentionally disabled -->
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.FLASHLIGHT" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CAMERA" />
<!-- CSU: camera access is intentionally disabled -->
<!-- <uses-permission android:name="android.permission.CAMERA" /> -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<!-- CSU: all-files access is intentionally disabled -->
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- These statements are required as these permissions will be included otherwise -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<!-- CSU: call log access is intentionally disabled -->
<!-- <uses-permission android:name="android.permission.READ_CALL_LOG"/> -->
<!-- CSU: contacts access is intentionally disabled -->
<!-- <uses-permission android:name="android.permission.READ_CONTACTS"/> -->
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

<!-- These statements prevent these permissions to be included in merged manifest -->
<uses-permission
android:name="android.permission.READ_CALL_LOG"/>
android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
tools:node="remove" />
<uses-permission
android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
tools:node="remove" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
tools:node="remove" />

<application
android:name=".Global"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,20 @@ public class Global extends Application {
public void onCreate() {
super.onCreate();
instance = this;
permissions = new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.VIBRATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.INTERNET, Manifest.permission.CAMERA, Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CHANGE_WIFI_STATE};
permissions = new String[]{
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.VIBRATE,
// CSU: media/photos access is intentionally disabled.
// Manifest.permission.READ_EXTERNAL_STORAGE,
// Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.INTERNET,
// CSU: camera access is intentionally disabled.
// Manifest.permission.CAMERA,
Manifest.permission.ACCESS_NETWORK_STATE,
Manifest.permission.ACCESS_WIFI_STATE,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.CHANGE_WIFI_STATE
};
}

public static Global getGlobal() {
Expand Down
1 change: 1 addition & 0 deletions claimManagement/src/main/res/layout/activity_claim.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
android:layout_width="55dp"
android:layout_height="55dp"
android:contentDescription="@string/Scan"
android:visibility="gone"
android:scaleType="fitXY"
android:src="@drawable/scan" />
</LinearLayout>
Expand Down
1 change: 1 addition & 0 deletions claimManagement/src/main/res/layout/content_enquire.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
android:layout_height="60dp"
android:layout_margin="5dp"
android:contentDescription="@string/Scan"
android:visibility="gone"
android:src="@drawable/scan"
android:scaleType="fitXY"/>

Expand Down