Loading cmds/dumpstate/bugreport-format.md +9 −9 Original line number Original line Diff line number Diff line Loading @@ -15,13 +15,13 @@ _bugreport-DATE.txt_ (where _DATE_ is date the bugreport was generated, in the format _YYYY-MM-DD-HH-MM-SS_), and Shell simply propagates it as an attachment format _YYYY-MM-DD-HH-MM-SS_), and Shell simply propagates it as an attachment in the `ACTION_SEND_MULTIPLE` intent. in the `ACTION_SEND_MULTIPLE` intent. ## Version v0 (Android M) ## Version 0 (Android M) On _Android M (Marshmallow)_, dumpstate still generates a flat On _Android M (Marshmallow)_, dumpstate still generates a flat _bugreport-DATE.txt_ file, but then **Shell** creates a zip file called _bugreport-DATE.txt_ file, but then **Shell** creates a zip file called _bugreport-DATE.zip_ containing a _bugreport-DATE.txt_ entry and sends that _bugreport-DATE.zip_ containing a _bugreport-DATE.txt_ entry and sends that file as the `ACTION_SEND_MULTIPLE` attachment. file as the `ACTION_SEND_MULTIPLE` attachment. ## Version v1 (Android N) ## Version 1.0 (Android N) On _Android N (TBD)_, `dumpstate` generates a zip file directly (unless there On _Android N (TBD)_, `dumpstate` generates a zip file directly (unless there is a failure, in which case it reverts to the flat file that is zipped by is a failure, in which case it reverts to the flat file that is zipped by **Shell** and hence the end result is the _v0_ format). **Shell** and hence the end result is the _v0_ format). Loading @@ -33,7 +33,7 @@ _bugreport-BUILD_ID-NEW_NAME.txt_ respectively. The zip file also contains 2 metadata entries generated by `dumpstate`: The zip file also contains 2 metadata entries generated by `dumpstate`: - `version.txt`: whose value is **v1**. - `version.txt`: whose value is **1.0**. - `main-entry.txt`: whose value is the name of the flat text entry (i.e., - `main-entry.txt`: whose value is the name of the flat text entry (i.e., _bugreport-BUILD_ID-DATE.txt_ or _bugreport-NEW_NAME.txt_). _bugreport-BUILD_ID-DATE.txt_ or _bugreport-NEW_NAME.txt_). Loading Loading @@ -61,16 +61,16 @@ _-devX-EXPERIMENTAL_FEATURE_, where _X_ is a number that increases as the changes become stable. changes become stable. For example, the initial version during _Android N_ development was For example, the initial version during _Android N_ development was **v1-dev1**. When `dumpsys` was split in 2 sections but not all tools were **1.0-dev1**. When `dumpsys` was split in 2 sections but not all tools were ready to parse that format, the version was named **v1-dev2**, ready to parse that format, the version was named **1.0-dev2**, which had to be passed do `dumpsys` explicitly (i.e., trhough a which had to be passed do `dumpsys` explicitly (i.e., trhough a `-V v1-dev2` argument). Once that format became stable and tools `-V 1.0-dev2` argument). Once that format became stable and tools knew how to parse it, the default version became **v1-dev2**. knew how to parse it, the default version became **1.0-dev2**. Similarly, if changes in the file format are made after the initial release of Similarly, if changes in the file format are made after the initial release of Android defining that format, then a new _sub-version_ will be used. Android defining that format, then a new _sub-version_ will be used. For example, if after _Android N_ launches changes are made for the next _N_ For example, if after _Android N_ launches changes are made for the next _N_ release, the version will be called **v1.1** or something like that. release, the version will be called **1.1** or something like that. Determining version and main entry Determining version and main entry ----------------------------------------------- ----------------------------------------------- Loading @@ -83,7 +83,7 @@ If [entries contain "version.txt"] version = read("version.txt") version = read("version.txt") main_entry = read("main_entry.txt") main_entry = read("main_entry.txt") else else version = v0 version = 0 main_entry = entries[0] main_entry = entries[0] fi fi ``` ``` cmds/dumpstate/dumpstate.cpp +1 −2 Original line number Original line Diff line number Diff line Loading @@ -96,8 +96,7 @@ std::string bugreport_dir; * * * See bugreport-format.txt for more info. * See bugreport-format.txt for more info. */ */ // TODO: change to "v1" before final N build static std::string VERSION_DEFAULT = "1.0"; static std::string VERSION_DEFAULT = "v1-dev4"; bool is_user_build() { bool is_user_build() { return 0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1); return 0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1); Loading Loading
cmds/dumpstate/bugreport-format.md +9 −9 Original line number Original line Diff line number Diff line Loading @@ -15,13 +15,13 @@ _bugreport-DATE.txt_ (where _DATE_ is date the bugreport was generated, in the format _YYYY-MM-DD-HH-MM-SS_), and Shell simply propagates it as an attachment format _YYYY-MM-DD-HH-MM-SS_), and Shell simply propagates it as an attachment in the `ACTION_SEND_MULTIPLE` intent. in the `ACTION_SEND_MULTIPLE` intent. ## Version v0 (Android M) ## Version 0 (Android M) On _Android M (Marshmallow)_, dumpstate still generates a flat On _Android M (Marshmallow)_, dumpstate still generates a flat _bugreport-DATE.txt_ file, but then **Shell** creates a zip file called _bugreport-DATE.txt_ file, but then **Shell** creates a zip file called _bugreport-DATE.zip_ containing a _bugreport-DATE.txt_ entry and sends that _bugreport-DATE.zip_ containing a _bugreport-DATE.txt_ entry and sends that file as the `ACTION_SEND_MULTIPLE` attachment. file as the `ACTION_SEND_MULTIPLE` attachment. ## Version v1 (Android N) ## Version 1.0 (Android N) On _Android N (TBD)_, `dumpstate` generates a zip file directly (unless there On _Android N (TBD)_, `dumpstate` generates a zip file directly (unless there is a failure, in which case it reverts to the flat file that is zipped by is a failure, in which case it reverts to the flat file that is zipped by **Shell** and hence the end result is the _v0_ format). **Shell** and hence the end result is the _v0_ format). Loading @@ -33,7 +33,7 @@ _bugreport-BUILD_ID-NEW_NAME.txt_ respectively. The zip file also contains 2 metadata entries generated by `dumpstate`: The zip file also contains 2 metadata entries generated by `dumpstate`: - `version.txt`: whose value is **v1**. - `version.txt`: whose value is **1.0**. - `main-entry.txt`: whose value is the name of the flat text entry (i.e., - `main-entry.txt`: whose value is the name of the flat text entry (i.e., _bugreport-BUILD_ID-DATE.txt_ or _bugreport-NEW_NAME.txt_). _bugreport-BUILD_ID-DATE.txt_ or _bugreport-NEW_NAME.txt_). Loading Loading @@ -61,16 +61,16 @@ _-devX-EXPERIMENTAL_FEATURE_, where _X_ is a number that increases as the changes become stable. changes become stable. For example, the initial version during _Android N_ development was For example, the initial version during _Android N_ development was **v1-dev1**. When `dumpsys` was split in 2 sections but not all tools were **1.0-dev1**. When `dumpsys` was split in 2 sections but not all tools were ready to parse that format, the version was named **v1-dev2**, ready to parse that format, the version was named **1.0-dev2**, which had to be passed do `dumpsys` explicitly (i.e., trhough a which had to be passed do `dumpsys` explicitly (i.e., trhough a `-V v1-dev2` argument). Once that format became stable and tools `-V 1.0-dev2` argument). Once that format became stable and tools knew how to parse it, the default version became **v1-dev2**. knew how to parse it, the default version became **1.0-dev2**. Similarly, if changes in the file format are made after the initial release of Similarly, if changes in the file format are made after the initial release of Android defining that format, then a new _sub-version_ will be used. Android defining that format, then a new _sub-version_ will be used. For example, if after _Android N_ launches changes are made for the next _N_ For example, if after _Android N_ launches changes are made for the next _N_ release, the version will be called **v1.1** or something like that. release, the version will be called **1.1** or something like that. Determining version and main entry Determining version and main entry ----------------------------------------------- ----------------------------------------------- Loading @@ -83,7 +83,7 @@ If [entries contain "version.txt"] version = read("version.txt") version = read("version.txt") main_entry = read("main_entry.txt") main_entry = read("main_entry.txt") else else version = v0 version = 0 main_entry = entries[0] main_entry = entries[0] fi fi ``` ```
cmds/dumpstate/dumpstate.cpp +1 −2 Original line number Original line Diff line number Diff line Loading @@ -96,8 +96,7 @@ std::string bugreport_dir; * * * See bugreport-format.txt for more info. * See bugreport-format.txt for more info. */ */ // TODO: change to "v1" before final N build static std::string VERSION_DEFAULT = "1.0"; static std::string VERSION_DEFAULT = "v1-dev4"; bool is_user_build() { bool is_user_build() { return 0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1); return 0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1); Loading
