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

am c077ee31: Merge "Added copyright notice and formatted to convention"

Browse Source 
* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention
This commit is contained in:
Yang Ni
2015-03-19 21:41:59 +00:00
committed by Android Git Automerger
parent b45d3926f3 c077ee316e
commit f2ea01717b
1 changed files with 319 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rs/java/android/renderscript/ScriptGroup2.java
View File

@@ -1,3 +1,19 @@
/*
* Copyright (C) 2015 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.renderscript; package android.renderscript;
import android.util.Log; import android.util.Log;
@@ -13,18 +29,18 @@ import java.util.Map;
You have tried to change the API from what has been previously approved. You have tried to change the API from what has been previously approved.
To make these errors go away, you have two choices: To make these errors go away, you have two choices:
1) You can add "@hide" javadoc comments to the methods, etc. listed in the 1) You can add "@hide" javadoc comments to the methods, etc. listed in the
errors above. errors above.
2) You can update current.txt by executing the following command: 2) You can update current.txt by executing the following command:
make update-api make update-api
To submit the revised current.txt to the main Android repository, To submit the revised current.txt to the main Android repository,
you will need approval. you will need approval.
****************************** ******************************
@hide Pending Android public API approval. @hide Pending Android public API approval.
*/ */
public class ScriptGroup2 extends BaseObj { public class ScriptGroup2 extends BaseObj {
public static class Closure extends BaseObj { public static class Closure extends BaseObj {
@@ -129,8 +145,11 @@ public class ScriptGroup2 extends BaseObj {
setID(id); setID(id);
} }
private static void retrieveValueAndDependenceInfo(RenderScript rs, private static
int index, Object obj, long[] values, int[] sizes, long[] depClosures, void retrieveValueAndDependenceInfo(RenderScript rs,
int index, Object obj,
long[] values, int[] sizes,
long[] depClosures,
long[] depFieldIDs) { long[] depFieldIDs) {
if (obj instanceof Future) { if (obj instanceof Future) {