Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afad7170 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge changes If24c6b7c,I381b0103 am: 67b7e640 

am: aeda63b1

Change-Id: Ib0e206f27aa4f6cacb0e67cb7dc18cf3660872ba
parents e5df945d aeda63b1

PREUPLOAD.cfg

+1 −2
Original line number Original line Diff line number Diff line
@@ -7,5 +7,4 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 




[Hook Scripts]

[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

                  -fw updater_sample/

                  --file_whitelist tools/ updater_sample/

tools/image_generator/ImageGenerator.java

+11 −13
Original line number Original line Diff line number Diff line
@@ -16,6 +16,16 @@ 




package com.android.recovery.tools;

package com.android.recovery.tools;





import org.apache.commons.cli.CommandLine;

import org.apache.commons.cli.GnuParser;

import org.apache.commons.cli.HelpFormatter;

import org.apache.commons.cli.OptionBuilder;

import org.apache.commons.cli.Options;

import org.apache.commons.cli.ParseException;

import org.w3c.dom.Document;

import org.w3c.dom.Node;

import org.w3c.dom.NodeList;



import java.awt.Color;

import java.awt.Color;

import java.awt.Font;

import java.awt.Font;

import java.awt.FontFormatException;

import java.awt.FontFormatException;
@@ -32,25 +42,14 @@ import java.util.List; 
import java.util.Locale;

import java.util.Locale;

import java.util.Map;

import java.util.Map;

import java.util.Set;

import java.util.Set;

import java.util.TreeMap;

import java.util.StringTokenizer;

import java.util.StringTokenizer;

import java.util.TreeMap;





import javax.imageio.ImageIO;

import javax.imageio.ImageIO;

import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilderFactory;

import javax.xml.parsers.DocumentBuilderFactory;

import javax.xml.parsers.ParserConfigurationException;

import javax.xml.parsers.ParserConfigurationException;





import org.apache.commons.cli.CommandLine;

import org.apache.commons.cli.GnuParser;

import org.apache.commons.cli.HelpFormatter;

import org.apache.commons.cli.OptionBuilder;

import org.apache.commons.cli.Options;

import org.apache.commons.cli.ParseException;



import org.w3c.dom.Document;

import org.w3c.dom.Node;

import org.w3c.dom.NodeList;



/**

/**

 * Command line tool to generate the localized image for recovery mode.

 * Command line tool to generate the localized image for recovery mode.

 */

 */
@@ -552,4 +551,3 @@ public class ImageGenerator { 
    imageGenerator.generateImage(localizedStringMap, cmd.getOptionValue("output_file"));

    imageGenerator.generateImage(localizedStringMap, cmd.getOptionValue("output_file"));

  }

  }

}
 
}