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

Commit 28440ed3 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev 

am: 0716c8e6

Change-Id: I1016361cd17be52a02a21fb4d1da791c0247be1d
parents 793c4be8 0716c8e6

Android.mk

+0 −9
Original line number Original line Diff line number Diff line
@@ -571,15 +571,6 @@ LOCAL_SRC_FILES += \ 




LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings

LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings





LOCAL_AIDL_INCLUDES += frameworks/base/lowpan/java

LOCAL_SRC_FILES += \

	lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl \

	lowpan/java/android/net/lowpan/ILowpanNetScanCallback.aidl \

	lowpan/java/android/net/lowpan/ILowpanInterfaceListener.aidl \

	lowpan/java/android/net/lowpan/ILowpanInterface.aidl \

	lowpan/java/android/net/lowpan/ILowpanManagerListener.aidl \

	lowpan/java/android/net/lowpan/ILowpanManager.aidl



# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk

# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk

LOCAL_AIDL_INCLUDES += \

LOCAL_AIDL_INCLUDES += \

      $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \

      $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \

core/res/AndroidManifest.xml

+0 −21
Original line number Original line Diff line number Diff line
@@ -1326,27 +1326,6 @@ 
    <permission android:name="android.permission.NETWORK_SETTINGS"

    <permission android:name="android.permission.NETWORK_SETTINGS"

        android:protectionLevel="signature" />

        android:protectionLevel="signature" />





    <!-- #SystemApi @hide Allows applications to access information about LoWPAN interfaces.

         <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.ACCESS_LOWPAN_STATE"

        android:protectionLevel="signature|privileged" />



    <!-- #SystemApi @hide Allows applications to change LoWPAN connectivity state.

         <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.CHANGE_LOWPAN_STATE"

        android:protectionLevel="signature|privileged" />



    <!-- #SystemApi @hide Allows applications to read LoWPAN credential.

         <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.READ_LOWPAN_CREDENTIAL"

        android:protectionLevel="signature|privileged" />



    <!-- #SystemApi @hide Allows a service to register or unregister

         new LoWPAN interfaces.

         <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.MANAGE_LOWPAN_INTERFACES"

        android:protectionLevel="signature|privileged" />



    <!-- ======================================= -->

    <!-- ======================================= -->

    <!-- Permissions for short range, peripheral networks -->

    <!-- Permissions for short range, peripheral networks -->

    <!-- ======================================= -->

    <!-- ======================================= -->

lowpan/Android.mk

deleted100644 → 0
+0 −31
Original line number Original line Diff line number Diff line 
#

# 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.

#



LOCAL_PATH := $(call my-dir)



ifneq (,$(findstring lowpan/java,$(FRAMEWORKS_BASE_SUBDIRS)))

include $(CLEAR_VARS)

LOCAL_MODULE := libandroid_net_lowpan

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES += libbase

LOCAL_SHARED_LIBRARIES += libbinder

LOCAL_SHARED_LIBRARIES += libutils

LOCAL_AIDL_INCLUDES += frameworks/native/aidl/binder

LOCAL_AIDL_INCLUDES += frameworks/base/lowpan/java

LOCAL_AIDL_INCLUDES += frameworks/base/core/java

LOCAL_SRC_FILES += $(call all-Iaidl-files-under, java/android/net/lowpan)

include $(BUILD_SHARED_LIBRARY)

endif

lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl

deleted100644 → 0
+0 −23
Original line number Original line Diff line number Diff line 
/*

 * 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.

 */



package android.net.lowpan;



/** {@hide} */

interface ILowpanEnergyScanCallback {

    oneway void onEnergyScanResult(int channel, int rssi);

    oneway void onEnergyScanFinished();

}

lowpan/java/android/net/lowpan/ILowpanInterface.aidl

deleted100644 → 0
+0 −154
Original line number Original line Diff line number Diff line 
/*

 * 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.

 */



package android.net.lowpan;



import android.net.lowpan.ILowpanInterfaceListener;

import android.net.lowpan.ILowpanNetScanCallback;

import android.net.lowpan.ILowpanEnergyScanCallback;

import android.os.PersistableBundle;

import android.net.IpPrefix;



/** {@hide} */

interface ILowpanInterface {



    //////////////////////////////////////////////////////////////////////////

    // Permission String Constants



    /* These are here for the sake of C++ interface implementations. */



    const String PERM_ACCESS_LOWPAN_STATE    = "android.permission.ACCESS_LOWPAN_STATE";

    const String PERM_CHANGE_LOWPAN_STATE    = "android.permission.CHANGE_LOWPAN_STATE";

    const String PERM_READ_LOWPAN_CREDENTIAL = "android.permission.READ_LOWPAN_CREDENTIAL";



    //////////////////////////////////////////////////////////////////////////

    // Property Key Constants



    const String KEY_INTERFACE_ENABLED      = "android.net.lowpan.property.INTERFACE_ENABLED";

    const String KEY_INTERFACE_UP           = "android.net.lowpan.property.INTERFACE_UP";

    const String KEY_INTERFACE_COMMISSIONED = "android.net.lowpan.property.INTERFACE_COMMISSIONED";

    const String KEY_INTERFACE_CONNECTED    = "android.net.lowpan.property.INTERFACE_CONNECTED";

    const String KEY_INTERFACE_STATE        = "android.net.lowpan.property.INTERFACE_STATE";



    const String KEY_NETWORK_NAME             = "android.net.lowpan.property.NETWORK_NAME";

    const String KEY_NETWORK_TYPE             = "android.net.lowpan.property.NETWORK_TYPE";

    const String KEY_NETWORK_PANID            = "android.net.lowpan.property.NETWORK_PANID";

    const String KEY_NETWORK_XPANID           = "android.net.lowpan.property.NETWORK_XPANID";

    const String KEY_NETWORK_ROLE             = "android.net.lowpan.property.NETWORK_ROLE";

    const String KEY_NETWORK_MASTER_KEY       = "android.net.lowpan.property.NETWORK_MASTER_KEY";

    const String KEY_NETWORK_MASTER_KEY_INDEX

        = "android.net.lowpan.property.NETWORK_MASTER_KEY_INDEX";



    const String KEY_SUPPORTED_CHANNELS = "android.net.lowpan.property.SUPPORTED_CHANNELS";

    const String KEY_CHANNEL            = "android.net.lowpan.property.CHANNEL";

    const String KEY_CHANNEL_MASK       = "android.net.lowpan.property.CHANNEL_MASK";

    const String KEY_MAX_TX_POWER       = "android.net.lowpan.property.MAX_TX_POWER";

    const String KEY_RSSI               = "android.net.lowpan.property.RSSI";

    const String KEY_LQI                = "android.net.lowpan.property.LQI";



    const String KEY_LINK_ADDRESS_ARRAY = "android.net.lowpan.property.LINK_ADDRESS_ARRAY";

    const String KEY_ROUTE_INFO_ARRAY   = "android.net.lowpan.property.ROUTE_INFO_ARRAY";



    const String KEY_BEACON_ADDRESS     = "android.net.lowpan.property.BEACON_ORIGIN_ADDRESS";

    const String KEY_BEACON_CAN_ASSIST  = "android.net.lowpan.property.BEACON_CAN_ASSIST";



    const String DRIVER_VERSION         = "android.net.lowpan.property.DRIVER_VERSION";

    const String NCP_VERSION            = "android.net.lowpan.property.NCP_VERSION";



    /** @hide */

    const String KEY_EXTENDED_ADDRESS = "android.net.lowpan.property.EXTENDED_ADDRESS";



    /** @hide */

    const String KEY_MAC_ADDRESS      = "android.net.lowpan.property.MAC_ADDRESS";



    //////////////////////////////////////////////////////////////////////////

    // Interface States



    const String STATE_OFFLINE = "offline";

    const String STATE_COMMISSIONING = "commissioning";

    const String STATE_ATTACHING = "attaching";

    const String STATE_ATTACHED = "attached";

    const String STATE_FAULT = "fault";



    //////////////////////////////////////////////////////////////////////////

    // Device Roles



    const String ROLE_END_DEVICE = "end-device";

    const String ROLE_ROUTER = "router";

    const String ROLE_SLEEPY_END_DEVICE = "sleepy-end-device";

    const String ROLE_SLEEPY_ROUTER = "sleepy-router";

    const String ROLE_UNKNOWN = "unknown";



    //////////////////////////////////////////////////////////////////////////

    // Service-Specific Error Code Constants



    const int ERROR_UNSPECIFIED = 1;

    const int ERROR_INVALID_ARGUMENT = 2;

    const int ERROR_DISABLED = 3;

    const int ERROR_WRONG_STATE = 4;

    const int ERROR_INVALID_TYPE = 5;

    const int ERROR_INVALID_VALUE = 6;

    const int ERROR_TIMEOUT = 7;

    const int ERROR_IO_FAILURE = 8;

    const int ERROR_BUSY = 9;

    const int ERROR_ALREADY = 10;

    const int ERROR_CANCELED = 11;

    const int ERROR_CREDENTIAL_NEEDED = 12;

    const int ERROR_FEATURE_NOT_SUPPORTED = 14;

    const int ERROR_PROPERTY_NOT_FOUND = 16;

    const int ERROR_JOIN_FAILED_UNKNOWN = 18;

    const int ERROR_JOIN_FAILED_AT_SCAN = 19;

    const int ERROR_JOIN_FAILED_AT_AUTH = 20;

    const int ERROR_FORM_FAILED_AT_SCAN = 21;

    const int ERROR_NCP_PROBLEM = 27;

    const int ERROR_PERMISSION_DENIED = 28;



    //////////////////////////////////////////////////////////////////////////

    // Methods



    @utf8InCpp String getName();



    void join(in Map parameters);

    void form(in Map parameters);

    void leave();

    void reset();



    void beginLowPower();

    void pollForData();



    oneway void onHostWake();



    @utf8InCpp String[] getPropertyKeys();

    Map getProperties(in @utf8InCpp String[] keys);

    void setProperties(in Map properties);



    void addListener(ILowpanInterfaceListener listener);

    oneway void removeListener(ILowpanInterfaceListener listener);



    void startNetScan(in Map properties, ILowpanNetScanCallback listener);

    oneway void stopNetScan();



    void startEnergyScan(in Map properties, ILowpanEnergyScanCallback listener);

    oneway void stopEnergyScan();



    void addOnMeshPrefix(in IpPrefix prefix, int flags);

    oneway void removeOnMeshPrefix(in IpPrefix prefix);



    void addExternalRoute(in IpPrefix prefix, int flags);

    oneway void removeExternalRoute(in IpPrefix prefix);



    @utf8InCpp String getPropertyAsString(@utf8InCpp String key);

}