summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fs_mrg: clean up multi-type mount_allJP Abgrall2014-07-023-66/+100
| | | | | | | | | | | Move the code that attempts to mount alternative fstab entries into its own function. Clarify return codes. Suggest wipe via recovery in error messages. Bug: 15747366 Change-Id: I3634477cd4d1d73f974f3e906c53285f0d9e0eac Signed-off-by: JP Abgrall <jpa@google.com>
* Added support for vendor partition to adbDaniel Rosenberg2014-07-024-48/+87
| | | | | | | | | Remount will now remount the vendor partition as well, if it exists. Sync will also allow you to sync vendor, and will include it by default if it exists. Change-Id: Iea1e8212f445e96233438a8d8a9d3266bf3d6557 Signed-off-by: Daniel Rosenberg <drosen@google.com>
* Merge "fs_mgr: fix crash on "noemulatedsd" in fstab"Todd Poynor2014-07-011-6/+2
|\
| * fs_mgr: fix crash on "noemulatedsd" in fstabTodd Poynor2014-07-011-6/+2
| | | | | | | | | | | | | | | | | | | | MF_FORCECRYPT claimed same flag value as existing MF_NOEMULATEDSD. MF_FORCECRYPT also crashes if no "=" in the option. Modify MF_NOEMULATEDSD flag value to unique, and reformat comment to keep the definition near the other defines. Change-Id: Iec86f40ff43eea14b791d3d19c0ae11fd4b5f784
* | healthd: fix 64-bit buildColin Cross2014-07-011-1/+1
| | | | | | | | | | | | int64_t needs to be printed with PRId64 Change-Id: If59b60bac71856e4266d459d159a570961e7340a
* | Merge "charger: leave screen off when entered with very low battery"Todd Poynor2014-06-301-7/+23
|\ \ | |/
| * charger: leave screen off when entered with very low batteryTodd Poynor2014-06-301-7/+23
| | | | | | | | Change-Id: I28e3d6adaf4bb59d14eca7103d7b063d54a41c75
* | Define force usage and category for System Audio.Jungshik Jang2014-07-011-0/+3
| | | | | | | | | | | | | | | | System Audio Control in HDMI-CEC delegates audio output to Audio Receiver and audio output port is one of ARC, SPDIF and analog output (line). Change-Id: Ieb325f754f039e09aae68b700349861ca4e08cbc
* | am fac28281: am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of ↵Elliott Hughes2014-06-301-3/+0
|\ \ | | | | | | | | | | | | | | | | | | <sys/_properties.h>." * commit 'fac2828161b6b14b7e862d94f2f4ef467621c832': Remove an unused #include of <sys/_properties.h>.
| * \ am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of ↵Elliott Hughes2014-06-301-3/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | <sys/_properties.h>." * commit 'b13e4b5eb6ad00bfcd8b4cdb6219f8bbbca4c85d': Remove an unused #include of <sys/_properties.h>.
| | * \ am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>."Elliott Hughes2014-06-301-3/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '5a53ee0502c198fb114bbf7bb34643d9682ba9b8': Remove an unused #include of <sys/_properties.h>.
| | | * \ Merge "Remove an unused #include of <sys/_properties.h>."Elliott Hughes2014-06-271-3/+0
| | | |\ \
| | | | * | Remove an unused #include of <sys/_properties.h>.Elliott Hughes2014-06-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15704351 Change-Id: I7841da7176d0638ae6737fe719cd187892bc38e6
* | | | | | Merge "fs_msg: fix bad tmpfs detection (fix /persist mount errors)"JP Abgrall2014-06-301-1/+1
|\ \ \ \ \ \
| * | | | | | fs_msg: fix bad tmpfs detection (fix /persist mount errors)JP Abgrall2014-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, the wrong mount point is flagged as being mounted. Which leads to: <6>[ 3.278040] fs_mgr: __mount(source=/dev/block/platform/msm_sdcc.1/by-name/userdata,target=/data,type=ext4)=-1 <7>[ 3.278834] SELinux: initialized (dev tmpfs, type tmpfs), uses transition SIDs <6>[ 3.278925] fs_mgr: fs_mgr_mount_all(): skipping fstab dup mountpoint=/persist rec[3].fs_type=ext4 already mounted. Bug: 15925030 Bug: 15976144 Change-Id: I0bc617f11dfc97c32bb2d0e52b94ec19282568eb
* | | | | | | am 092954de: (-s ours) am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge ↵Todd Poynor2014-06-300-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | "Charger: Avoid animation while not charging DO NOT MERGE" * commit '092954dec1df391274217a99d623d16fd01d0347': Charger: Avoid animation while not charging DO NOT MERGE
| * | | | | am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid ↵Todd Poynor2014-06-300-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animation while not charging DO NOT MERGE" * commit 'f9db4ab97e58f15f84642ac133e33bd89107c944': Charger: Avoid animation while not charging DO NOT MERGE
| | * | | | am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO ↵Todd Poynor2014-06-300-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit 'd4d1b5045cfb602a7c57cbf29b2543e26106a1fd': Charger: Avoid animation while not charging DO NOT MERGE
| | | * | | Merge "Charger: Avoid animation while not charging DO NOT MERGE"Todd Poynor2014-06-301-11/+20
| | | |\ \ \
| | | | * | | Charger: Avoid animation while not charging DO NOT MERGEJenny TC2014-06-301-11/+20
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present, charging animation runs irrespective of whether charger is connected or not. When the charger is disconnected, device not shutdown for 10secs. Charging animation during this period should be avoided. Change-Id: Idf8e6a11261aec2812f1ebbbdec1bd1ad769565e Signed-off-by: Pavan Kumar S <pavan.kumar.s@intel.com> Signed-off-by: Jenny TC <jenny.tc@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | | am 98569bc7: am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as ↵Narayan Kamath2014-06-306-6/+14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native tests, not executables." * commit '98569bc7089d84478e4ab39046c0a297358a9603': Build pixelflinger tests as native tests, not executables.
| * | | | | am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as native tests, ↵Narayan Kamath2014-06-306-6/+14
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not executables." * commit 'da3fb5374a5c012dc65f193d0d84a732dd628b21': Build pixelflinger tests as native tests, not executables.
| | * | | | am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables."Narayan Kamath2014-06-306-6/+14
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '6e074c68e2cfb35683733ab561801c647723ac57': Build pixelflinger tests as native tests, not executables.
| | | * | | Merge "Build pixelflinger tests as native tests, not executables."Narayan Kamath2014-06-266-6/+14
| | | |\ \ \
| | | | * | | Build pixelflinger tests as native tests, not executables.Narayan Kamath2014-06-266-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has the side effect of building tests for both 32 and 64 bit, where required. Change-Id: I674800d34b4fa7cc5d34573c96b754ac85777970
* | | | | | | am 3e906630: am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED ↵Ian Rogers2014-06-291-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | for glibc support." * commit '3e906630099e0508a72300e14512a62110c864c3': Rename __unused to __UNUSED for glibc support.
| * | | | | am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."Ian Rogers2014-06-291-6/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '33dce382fd39b633731c925a1487a74332e86871': Rename __unused to __UNUSED for glibc support.
| | * | | | am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support."Ian Rogers2014-06-291-6/+6
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '63a61e561d7d3d6f10488a194fb730f9edec3edc': Rename __unused to __UNUSED for glibc support.
| | | * | | Merge "Rename __unused to __UNUSED for glibc support."Ian Rogers2014-06-281-6/+6
| | | |\ \ \
| | | | * | | Rename __unused to __UNUSED for glibc support.Ian Rogers2014-06-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Glibc declares unused fields as __unused and so a #define for __unused causes issues when we built against glibc on the host. Rename __unused to __UNUSED as a workaround. This fixed checkbuild for 64-bit host builds. Bug: 13751317 Change-Id: Ic2cd52518c16661497cc819cb3fd7f1fa5c6f0fb
* | | | | | | am 36d04e37: am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize ↵Mark Salyzyn2014-06-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cosmetics to internal" * commit '36d04e37ee84f17220442002d880473d465ca5ae': debuggerd: synchronize cosmetics to internal
| * | | | | | am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"Mark Salyzyn2014-06-271-13/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ac4efdd2b448b5a961776f481b1d753841bde5bb': debuggerd: synchronize cosmetics to internal
| | * | | | | am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal"Mark Salyzyn2014-06-271-13/+9
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '0a350f4f0857cd4a42b5099b8fda7766a35398cb': debuggerd: synchronize cosmetics to internal
| | | * | | | Merge "debuggerd: synchronize cosmetics to internal"Mark Salyzyn2014-06-271-13/+9
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | debuggerd: synchronize cosmetics to internalMark Salyzyn2014-06-271-13/+9
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: I66bc2b181cd75da188c046571492224d5ac3fc98
* | | | | | am 7e3a492f: am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in ↵Elliott Hughes2014-06-271-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debuggerd gdbclient output." * commit '7e3a492ff205a2e5ac5880e95dbb5bd0fa634cff': Fixed tid/pid mixup in debuggerd gdbclient output.
| * | | | | am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient ↵Elliott Hughes2014-06-271-5/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output." * commit '6f185dea32783dae7c833028460a6545eed0e09a': Fixed tid/pid mixup in debuggerd gdbclient output.
| | * | | | am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output."Elliott Hughes2014-06-271-5/+5
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e080be575419e77c909b54791ea2b44467a1a913': Fixed tid/pid mixup in debuggerd gdbclient output.
| | | * | | Merge "Fixed tid/pid mixup in debuggerd gdbclient output."Elliott Hughes2014-06-261-5/+5
| | | |\ \ \
| | | | * | | Fixed tid/pid mixup in debuggerd gdbclient output.Brigid Smith2014-06-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the debugging output shows the tid of the crashed thread instead of the pid of the process that crashed. Change-Id: I637f409ff02d73d458edc6d1a5c462c21d128211
* | | | | | | resolved conflicts for merge of ab5b8603 to masterMark Salyzyn2014-06-271-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I857725640bc77f04d93f04c52efc73335122e5ea
| * | | | | | am 44029223: am c8a7e34d: Merge "tombstone: log output header suppressed in ↵Mark Salyzyn2014-06-271-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash" * commit '44029223daef21ebd06a7b0e1655aff9254da63d': tombstone: log output header suppressed in crash
| | * | | | | am c8a7e34d: Merge "tombstone: log output header suppressed in crash"Mark Salyzyn2014-06-271-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c8a7e34dfc0f8f1c994168672db21175b28b931f': tombstone: log output header suppressed in crash
| | | * | | | Merge "tombstone: log output header suppressed in crash"Mark Salyzyn2014-06-271-1/+1
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | tombstone: log output header suppressed in crashMark Salyzyn2014-06-271-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15520846 Change-Id: I18934cc60af3dda98ab729fbabc4c7a66834512e
* | | | | | fs_mgr: increase tmpfs size to accommodate bigger dex2oat dataJP Abgrall2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During encryption and decryption, art is pumping out data via dex2oat into the /data that is actually a tmpfs. It currently needs ~195MB. So we increase the tmpfs from 128MB to 256MB. Bug: 15909689 Change-Id: I5d518a87d7b4eccf32fcd77f61980646ee8a3d35 Signed-off-by: JP Abgrall <jpa@google.com>
* | | | | | resolved conflicts for merge of fa6f2543 to masterRiley Andrews2014-06-265-8/+42
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I04ce82e5d245e90e2cc62b76d688ec902c1a471d
| * | | | | am 23340d8a: am 10f8cd1d: Merge changes Ia15b2110,I5498c725Riley Andrews2014-06-275-8/+42
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '23340d8adac7bf68a6e47064ab7b48c1e227a077': Add ability to adjust init log level at runtime. Improve init's debug printing.
| | * | | | am 10f8cd1d: Merge changes Ia15b2110,I5498c725Riley Andrews2014-06-275-8/+42
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '10f8cd1d87eccde36da2ac54ad7d390e34a6e224': Add ability to adjust init log level at runtime. Improve init's debug printing.
| | | * | | Merge changes Ia15b2110,I5498c725Riley Andrews2014-06-265-8/+42
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | * changes: Add ability to adjust init log level at runtime. Improve init's debug printing.
generated by cgit v1.1 at 2024-09-17 12:17:16 +0000