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

Move ShadeViewRefactor to right package to fix build breakage.

Browse Source 
ShadeViewRefactor's package java.lang.annotation was inconsistent
with its source directory; further, it broke taimen-userdebug-jdk9
because java.lang.annotation is a core library package and it's
no longer supported for framework to have code in such packages.

This CL fixes compilation by moving the annotation to the correct
package which corresponds to its source directory.

Test: make SystemUI-core
Bug: 115604102

Change-Id: I600e57da316f60855d71f69b1aa1939f2081d513
This commit is contained in:
Tobias Thierer
2018-09-19 13:49:53 +01:00
parent f72534931b
commit 23957aa974
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/ShadeViewRefactor.java
View File

@@ -14,7 +14,10 @@
* limitations under the License
*/
package java.lang.annotation;
package com.android.systemui.statusbar.notification;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.SOURCE)
public @interface ShadeViewRefactor {

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
View File

@@ -115,6 +115,8 @@ import com.android.systemui.statusbar.notification.row.StackScrollerDecorView;
import com.android.systemui.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.notification.FakeShadowView;
import com.android.systemui.statusbar.notification.NotificationUtils;
import com.android.systemui.statusbar.notification.ShadeViewRefactor;
import com.android.systemui.statusbar.notification.ShadeViewRefactor.RefactorComponent;
import com.android.systemui.statusbar.notification.VisibilityLocationProvider;
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.statusbar.phone.HeadsUpAppearanceController;
@@ -134,8 +136,6 @@ import com.android.systemui.statusbar.policy.ScrollAdapter;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.annotation.ShadeViewRefactor;
import java.lang.annotation.ShadeViewRefactor.RefactorComponent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;