@@ -102,7 +102,7 @@ public void onCreate() {
102102 @ SuppressLint ("NewApi" )
103103 public void enterForeground () {
104104 if (Build .VERSION .SDK_INT >= Build .VERSION_CODES .O ) {
105- NotificationChannel channel = new NotificationChannel (BuildConfig .APP_ID , "SdlService" , NotificationManager .IMPORTANCE_DEFAULT );
105+ NotificationChannel channel = new NotificationChannel (BuildConfig .SDL_APP_ID , "SdlService" , NotificationManager .IMPORTANCE_DEFAULT );
106106 NotificationManager notificationManager = (NotificationManager ) getSystemService (Context .NOTIFICATION_SERVICE );
107107 if (notificationManager != null ) {
108108 notificationManager .createNotificationChannel (channel );
@@ -159,14 +159,14 @@ private void startProxy() {
159159 } else {
160160 securityLevel = MultiplexTransportConfig .FLAG_MULTI_SECURITY_OFF ;
161161 }
162- transport = new MultiplexTransportConfig (this , BuildConfig .APP_ID , securityLevel );
162+ transport = new MultiplexTransportConfig (this , BuildConfig .SDL_APP_ID , securityLevel );
163163 if (BuildConfig .REQUIRE_AUDIO_OUTPUT .equals ("TRUE" ) ) {
164164 ((MultiplexTransportConfig )transport ).setRequiresAudioSupport (true );
165165 }
166166 } else if (BuildConfig .TRANSPORT .equals ("TCP" )) {
167167 transport = new TCPTransportConfig (TCP_PORT , DEV_MACHINE_IP_ADDRESS , true );
168168 } else if (BuildConfig .TRANSPORT .equals ("MULTI_HB" )) {
169- MultiplexTransportConfig mtc = new MultiplexTransportConfig (this , BuildConfig .APP_ID , MultiplexTransportConfig .FLAG_MULTI_SECURITY_OFF );
169+ MultiplexTransportConfig mtc = new MultiplexTransportConfig (this , BuildConfig .SDL_APP_ID , MultiplexTransportConfig .FLAG_MULTI_SECURITY_OFF );
170170 mtc .setRequiresHighBandwidth (true );
171171 transport = mtc ;
172172 }
@@ -213,8 +213,8 @@ public void onError(String info, Exception e) {
213213 @ Override
214214 public LifecycleConfigurationUpdate managerShouldUpdateLifecycle (Language language , Language hmiLanguage ) {
215215 boolean isNeedUpdate = false ;
216- String appName = BuildConfig .APP_NAME ;
217- String ttsName = BuildConfig .APP_NAME ;
216+ String appName = BuildConfig .SDL_APP_NAME ;
217+ String ttsName = BuildConfig .SDL_APP_NAME ;
218218 switch (language ) {
219219 case ES_MX :
220220 isNeedUpdate = true ;
@@ -258,7 +258,7 @@ public boolean onSystemInfoReceived(SystemInfo systemInfo) {
258258 SdlArtwork appIcon = new SdlArtwork (ICON_FILENAME , FileType .GRAPHIC_PNG , R .mipmap .ic_launcher , true );
259259
260260 // The manager builder sets options for your session
261- SdlManager .Builder builder = new SdlManager .Builder (this , BuildConfig .APP_ID , BuildConfig .APP_NAME , listener );
261+ SdlManager .Builder builder = new SdlManager .Builder (this , BuildConfig .SDL_APP_ID , BuildConfig .SDL_APP_NAME , listener );
262262 builder .setAppTypes (appType );
263263 builder .setTransportType (transport );
264264 builder .setAppIcon (appIcon );
@@ -373,7 +373,7 @@ private void performWelcomeSpeak() {
373373 */
374374 private void performWelcomeShow () {
375375 sdlManager .getScreenManager ().beginTransaction ();
376- sdlManager .getScreenManager ().setTextField1 (BuildConfig .APP_NAME );
376+ sdlManager .getScreenManager ().setTextField1 (BuildConfig .SDL_APP_NAME );
377377 sdlManager .getScreenManager ().setTextField2 (WELCOME_SHOW );
378378 sdlManager .getScreenManager ().setPrimaryGraphic (new SdlArtwork (SDL_IMAGE_FILENAME , FileType .GRAPHIC_PNG , R .drawable .sdl , true ));
379379 sdlManager .getScreenManager ().commit (new CompletionListener () {
0 commit comments