diff options
author | Jeremy Walker <jewalker@google.com> | 2016-04-14 11:02:29 -0700 |
---|---|---|
committer | Jeremy Walker <jewalker@google.com> | 2016-04-15 15:16:41 -0700 |
commit | 2b82fc566c4b2b6a44eb22ef38ba5bc762c126f8 (patch) | |
tree | b9dbe63aeb34e01f3079408bb932905293a58468 | |
parent | 603b4572af85cf4fe40c7dfe53fb0938dcc4516c (diff) | |
download | android-2b82fc566c4b2b6a44eb22ef38ba5bc762c126f8.tar.gz |
Removes BIND_LISTENER from manifests for RuntimePermissionsWear
sample.
Change-Id: Id33348d1d4460f59abfc561b28556b288121cc59
4 files changed, 26 insertions, 4 deletions
diff --git a/wearable/wear/RuntimePermissionsWear/Application/proguard-project.txt b/wearable/wear/RuntimePermissionsWear/Application/proguard-project.txt new file mode 100644 index 00000000..f2fe1559 --- /dev/null +++ b/wearable/wear/RuntimePermissionsWear/Application/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml b/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml index 861cad3b..d8a6a280 100644 --- a/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml +++ b/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml @@ -66,7 +66,8 @@ android:enabled="true" android:exported="true" > <intent-filter> - <action android:name="com.google.android.gms.wearable.BIND_LISTENER" /> + <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" /> + <data android:scheme="wear" android:host="*" android:pathPrefix="/"/> </intent-filter> </service> </application> diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml index 43218d78..e654253f 100644 --- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml +++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml @@ -61,7 +61,8 @@ android:enabled="true" android:exported="true" > <intent-filter> - <action android:name="com.google.android.gms.wearable.BIND_LISTENER" /> + <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" /> + <data android:scheme="wear" android:host="*" android:pathPrefix="/"/> </intent-filter> </service> </application> diff --git a/wearable/wear/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties b/wearable/wear/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties index 07fc193f..b0345831 100644 --- a/wearable/wear/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties +++ b/wearable/wear/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Thu Apr 14 11:01:23 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip |