Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e16fff1f authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by android-build-merger
Browse files

Merge "PBAP Client Account Authenticator" am: a21d1a3a am: 7ebc3062

am: 9ecfdedf

Change-Id: I2d764f7031a3d41fa6ff9ab1451c54666d2c7e97
parents 9c5bfc46 9ecfdedf
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@
        <!-- Authenticator for PBAP account. -->
        <service
            android:process="@string/process"
            android:name=".AuthenticationService"
            android:name=".pbapclient.AuthenticationService"
            android:exported="true"
            android:enabled="@bool/profile_supported_pbapclient">
            <intent-filter>
+4 −1
Original line number Diff line number Diff line
@@ -15,4 +15,7 @@
-->
<account-authenticator
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:accountType="@string/pbap_account_type" />
        android:icon="@mipmap/bt_share"
        android:smallIcon="@mipmap/bt_share"
        android:accountType="@string/pbap_account_type"
        android:label="@string/pbap_account_type" />
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.google.android.car.pbapsink;
package com.android.bluetooth.pbapclient;

import android.app.Service;
import android.content.Intent;
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.google.android.car.pbapsink;
package com.android.bluetooth.pbapclient;

import android.accounts.AbstractAccountAuthenticator;
import android.accounts.Account;