Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove test service for Assistant Handle requests" into rvc-dev am: 2ed4f550f4

Browse Source 
Change-Id: Ie488aa4d7380d68199042e5dee1325ab7e29c3cc
This commit is contained in:
TreeHugger Robot
2020-03-24 18:23:01 +00:00
committed by Automerger Merge Worker
parent 5925a2c5ea 2ed4f550f4
commit 26cb226028
3 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/AndroidManifest.xml
View File

@@ -300,11 +300,6 @@
android:exported="false" android:exported="false"
android:permission="com.android.systemui.permission.SELF" /> android:permission="com.android.systemui.permission.SELF" />
<service android:name=".assist.AssistHandleService"
android:exported="true"
android:enabled="false"
/>
<!-- started from PhoneWindowManager <!-- started from PhoneWindowManager
TODO: Should have an android:permission attribute --> TODO: Should have an android:permission attribute -->
<service android:name=".screenshot.TakeScreenshotService" <service android:name=".screenshot.TakeScreenshotService"

37
packages/SystemUI/src/com/android/systemui/assist/AssistHandleService.kt
View File

@@ -1,37 +0,0 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.systemui.assist
import android.app.Service
import android.content.Intent
import android.os.IBinder
import dagger.Lazy
import javax.inject.Inject
class AssistHandleService @Inject constructor(private val assistManager: Lazy<AssistManager>)
: Service() {
private val binder = object : IAssistHandleService.Stub() {
override fun requestAssistHandles() {
assistManager.get().requestAssistHandles()
}
}
override fun onBind(intent: Intent?): IBinder? {
return binder
}
}

9
packages/SystemUI/src/com/android/systemui/assist/AssistModule.java
View File

@@ -16,7 +16,6 @@
package com.android.systemui.assist; package com.android.systemui.assist;
import android.app.Service;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
@@ -34,11 +33,8 @@ import java.util.Map;
import javax.inject.Named; import javax.inject.Named;
import javax.inject.Singleton; import javax.inject.Singleton;
import dagger.Binds;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
import dagger.multibindings.ClassKey;
import dagger.multibindings.IntoMap;
/** Module for dagger injections related to the Assistant. */ /** Module for dagger injections related to the Assistant. */
@Module @Module
@@ -91,9 +87,4 @@ public abstract class AssistModule {
static Clock provideSystemClock() { static Clock provideSystemClock() {
return SystemClock::uptimeMillis; return SystemClock::uptimeMillis;
} }
@Binds
@IntoMap
@ClassKey(AssistHandleService.class)
abstract Service bindAssistHandleService(AssistHandleService assistHandleService);
} }