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

Commit 6ab663a6 authored by Eugene Susla's avatar Eugene Susla
Browse files

Add system feature for Companion Device Manager 

Bug: 30932767
Test: Add just the feature gating first, ensure Context#getSystemSetrvice now
returns null.
Add feature in the configuration files, ensure companion device feature works again.
Change-Id: I4ad2d52f7877eae0e951f43ddbb23881d5de8d8b
parent 25a286fd

data/etc/android.software.companion_device_setup.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 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.

-->



<permissions>

    <feature name="android.software.companion_device_setup" />

</permissions>

data/etc/handheld_core_hardware.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
    <feature name="android.software.input_methods" />

    <feature name="android.software.picture_in_picture" />

    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />



    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />

data/etc/tablet_core_hardware.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
    <feature name="android.software.input_methods" />

    <feature name="android.software.picture_in_picture" />

    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />



    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />