diff options
author | Amit Mahajan <amitmahajan@google.com> | 2020-01-22 18:26:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-22 18:26:49 +0000 |
commit | 77129e43f224bc110684e637f762c39dc47d4003 (patch) | |
tree | f3e89b2eb9b58ecb1e4dd900856e3def01e9f902 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e50a22c95c4e8068bae7db2acff93372b49ab18c (diff) | |
parent | 9204f468b066e1cf668686ae739d128a0c2ec2bd (diff) |
Merge changes from topics "npm-add-rm-listener-api", "rename-override-constants"
* changes:
NetworkPolicyManager: Add @SystemApi for mainlne module
Use Context.NETWORK_POLICY_SERVICE to get network policy service
Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi
Add setSubscriptionOverride() to system API
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions