Commit 15ac8230 authored by keunyoung's avatar keunyoung Committed by Android (Google) Code Review
Browse files

Merge "improve audio client: unlock keyguard and ignore orientation change" into jb-mr2-dev

parents 51d7c62b 41e22001
......@@ -17,6 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.cts.audiotest" >
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
......@@ -24,7 +25,8 @@
android:label="@string/app_name" >
<activity
android:name=".CtsAudioClientActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
......
......@@ -17,6 +17,7 @@
package com.android.cts.audiotest;
import android.app.Activity;
import android.app.KeyguardManager;
import android.content.Context;
import android.media.AudioManager;
import android.os.Bundle;
......@@ -54,6 +55,9 @@ public class CtsAudioClientActivity extends Activity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
KeyguardManager keyguardManager =
(KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
keyguardManager.newKeyguardLock("cts-audio").disableKeyguard();
}
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment