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

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

Merge changes If24c6b7c,I381b0103 am: 67b7e640 am: aeda63b1 

am: afad7170

Change-Id: I1f715c5de7c19514c5f9b5d62014bcf5ddb80598
parents 07b6112a afad7170

PREUPLOAD.cfg

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


[Hook Scripts]

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 Diff line number Diff line
@@ -16,6 +16,16 @@ 


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.Font;

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

import java.util.Map;

import java.util.Set;

import java.util.TreeMap;

import java.util.StringTokenizer;

import java.util.TreeMap;



import javax.imageio.ImageIO;

import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilderFactory;

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.

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

  }

}