ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9851 commits 1 branch 0 tags 217 MiB
Commit graph

9851 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Rosenberg
686bce6390 Added support for vendor partition to adb 
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>
 2014-07-02 20:00:49 +00:00
Todd Poynor
4a974df8ad Merge "fs_mgr: fix crash on "noemulatedsd" in fstab" 2014-07-01 19:15:58 +00:00
Todd Poynor
22f63e393f fs_mgr: fix crash on "noemulatedsd" in fstab 
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
 2014-07-01 17:57:13 -07:00
Colin Cross
d2b5bfa0cd healthd: fix 64-bit build 
int64_t needs to be printed with PRId64

Change-Id: If59b60bac71856e4266d459d159a570961e7340a
 2014-07-01 10:56:34 -07:00
Todd Poynor
ecedc9a697 Merge "charger: leave screen off when entered with very low battery" 2014-06-30 22:50:32 +00:00
Jungshik Jang
0c3664f08d Define force usage and category for System Audio. 
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
 2014-07-01 17:10:02 +09:00
Todd Poynor
a7300274fd charger: leave screen off when entered with very low battery 
Change-Id: I28e3d6adaf4bb59d14eca7103d7b063d54a41c75
 2014-06-30 13:25:53 -07:00
Elliott Hughes
e61679c2fe am fac28281: am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>." 
* commit 'fac2828161b6b14b7e862d94f2f4ef467621c832':
  Remove an unused #include of <sys/_properties.h>.
 2014-06-30 19:41:05 +00:00
Elliott Hughes
fac2828161 am b13e4b5e: am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>." 
* commit 'b13e4b5eb6ad00bfcd8b4cdb6219f8bbbca4c85d':
  Remove an unused #include of <sys/_properties.h>.
 2014-06-30 19:35:48 +00:00
Elliott Hughes
b13e4b5eb6 am 5a53ee05: Merge "Remove an unused #include of <sys/_properties.h>." 
* commit '5a53ee0502c198fb114bbf7bb34643d9682ba9b8':
  Remove an unused #include of <sys/_properties.h>.
 2014-06-30 19:30:34 +00:00
Todd Poynor
092954dec1 am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE" 
* commit 'f9db4ab97e58f15f84642ac133e33bd89107c944':
  Charger: Avoid animation while not charging DO NOT MERGE
 2014-06-30 18:30:45 +00:00
Todd Poynor
f9db4ab97e am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE" 
* commit 'd4d1b5045cfb602a7c57cbf29b2543e26106a1fd':
  Charger: Avoid animation while not charging DO NOT MERGE
 2014-06-30 18:25:36 +00:00
JP Abgrall
03c7c8e944 Merge "fs_msg: fix bad tmpfs detection (fix /persist mount errors)" 2014-06-30 17:43:33 +00:00
Todd Poynor
0f41d45353 am 092954de: (-s ours) am f9db4ab9: (-s ours) am d4d1b504: (-s ours) Merge "Charger: Avoid animation while not charging DO NOT MERGE" 
* commit '092954dec1df391274217a99d623d16fd01d0347':
  Charger: Avoid animation while not charging DO NOT MERGE
 2014-06-30 18:36:06 +00:00
JP Abgrall
7553d57298 fs_msg: fix bad tmpfs detection (fix /persist mount errors) 
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
 2014-06-30 18:28:09 +00:00
Todd Poynor
d4d1b5045c Merge "Charger: Avoid animation while not charging DO NOT MERGE" 2014-06-30 17:43:31 +00:00
Jenny TC
9cc4ea329f Charger: Avoid animation while not charging DO NOT MERGE 
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>
 2014-06-30 18:20:34 +00:00
Narayan Kamath
7742d9bf29 am 98569bc7: am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables." 
* commit '98569bc7089d84478e4ab39046c0a297358a9603':
  Build pixelflinger tests as native tests, not executables.
 2014-06-30 12:29:01 +00:00
Narayan Kamath
98569bc708 am da3fb537: am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables." 
* commit 'da3fb5374a5c012dc65f193d0d84a732dd628b21':
  Build pixelflinger tests as native tests, not executables.
 2014-06-30 12:24:52 +00:00
Narayan Kamath
da3fb5374a am 6e074c68: Merge "Build pixelflinger tests as native tests, not executables." 
* commit '6e074c68e2cfb35683733ab561801c647723ac57':
  Build pixelflinger tests as native tests, not executables.
 2014-06-30 12:19:44 +00:00
Ian Rogers
f267b06305 am 3e906630: am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support." 
* commit '3e906630099e0508a72300e14512a62110c864c3':
  Rename __unused to __UNUSED for glibc support.
 2014-06-29 23:14:09 +00:00
Ian Rogers
3e90663009 am 33dce382: am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support." 
* commit '33dce382fd39b633731c925a1487a74332e86871':
  Rename __unused to __UNUSED for glibc support.
 2014-06-29 23:08:49 +00:00
Ian Rogers
33dce382fd am 63a61e56: Merge "Rename __unused to __UNUSED for glibc support." 
* commit '63a61e561d7d3d6f10488a194fb730f9edec3edc':
  Rename __unused to __UNUSED for glibc support.
 2014-06-29 23:05:58 +00:00
Ian Rogers
63a61e561d Merge "Rename __unused to __UNUSED for glibc support." 2014-06-28 00:06:36 +00:00
Ian Rogers
de8b983357 Rename __unused to __UNUSED for glibc support. 
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
 2014-06-27 17:40:32 -07:00
Mark Salyzyn
a22f86668f am 36d04e37: am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal" 
* commit '36d04e37ee84f17220442002d880473d465ca5ae':
  debuggerd: synchronize cosmetics to internal
 2014-06-27 23:30:08 +00:00
Mark Salyzyn
36d04e37ee am ac4efdd2: am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal" 
* commit 'ac4efdd2b448b5a961776f481b1d753841bde5bb':
  debuggerd: synchronize cosmetics to internal
 2014-06-27 23:26:53 +00:00
Mark Salyzyn
ac4efdd2b4 am 0a350f4f: Merge "debuggerd: synchronize cosmetics to internal" 
* commit '0a350f4f0857cd4a42b5099b8fda7766a35398cb':
  debuggerd: synchronize cosmetics to internal
 2014-06-27 23:22:13 +00:00
Elliott Hughes
dfc3490c90 am 7e3a492f: am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output." 
* commit '7e3a492ff205a2e5ac5880e95dbb5bd0fa634cff':
  Fixed tid/pid mixup in debuggerd gdbclient output.
 2014-06-27 18:45:36 +00:00
Elliott Hughes
7e3a492ff2 am 6f185dea: am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output." 
* commit '6f185dea32783dae7c833028460a6545eed0e09a':
  Fixed tid/pid mixup in debuggerd gdbclient output.
 2014-06-27 18:39:47 +00:00
Elliott Hughes
6f185dea32 am e080be57: Merge "Fixed tid/pid mixup in debuggerd gdbclient output." 
* commit 'e080be575419e77c909b54791ea2b44467a1a913':
  Fixed tid/pid mixup in debuggerd gdbclient output.
 2014-06-27 18:34:23 +00:00
Mark Salyzyn
d4b6d18d7e resolved conflicts for merge of ab5b8603 to master 
Change-Id: I857725640bc77f04d93f04c52efc73335122e5ea
 2014-06-27 11:25:37 -07:00
Mark Salyzyn
ab5b8603ee am 44029223: am c8a7e34d: Merge "tombstone: log output header suppressed in crash" 
* commit '44029223daef21ebd06a7b0e1655aff9254da63d':
  tombstone: log output header suppressed in crash
 2014-06-27 18:09:35 +00:00
Mark Salyzyn
44029223da am c8a7e34d: Merge "tombstone: log output header suppressed in crash" 
* commit 'c8a7e34dfc0f8f1c994168672db21175b28b931f':
  tombstone: log output header suppressed in crash
 2014-06-27 18:06:06 +00:00
Elliott Hughes
5a53ee0502 Merge "Remove an unused #include of <sys/_properties.h>." 2014-06-27 16:59:53 +00:00
Elliott Hughes
11d783f1e7 Remove an unused #include of <sys/_properties.h>. 
Bug: 15704351
Change-Id: I7841da7176d0638ae6737fe719cd187892bc38e6
 2014-06-30 10:11:55 -07:00
Mark Salyzyn
0a350f4f08 Merge "debuggerd: synchronize cosmetics to internal" 2014-06-27 16:59:53 +00:00
Mark Salyzyn
17e85c0671 debuggerd: synchronize cosmetics to internal 
Change-Id: I66bc2b181cd75da188c046571492224d5ac3fc98
 2014-06-27 15:55:19 -07:00
Mark Salyzyn
c8a7e34dfc Merge "tombstone: log output header suppressed in crash" 2014-06-27 16:00:43 +00:00
Mark Salyzyn
e43290d7ed tombstone: log output header suppressed in crash 
Bug: 15520846
Change-Id: I18934cc60af3dda98ab729fbabc4c7a66834512e
 2014-06-27 10:32:22 -07:00
JP Abgrall
e29cbd3372 fs_mgr: increase tmpfs size to accommodate bigger dex2oat data 
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>
 2014-06-27 02:24:55 -07:00
Riley Andrews
24912dc446 resolved conflicts for merge of fa6f2543 to master 
Change-Id: I04ce82e5d245e90e2cc62b76d688ec902c1a471d
 2014-06-26 20:49:46 -07:00
Riley Andrews
fa6f25432b am 23340d8a: am 10f8cd1d: Merge changes Ia15b2110,I5498c725 
* commit '23340d8adac7bf68a6e47064ab7b48c1e227a077':
  Add ability to adjust init log level at runtime.
  Improve init's debug printing.
 2014-06-27 03:42:33 +00:00
Riley Andrews
23340d8ada am 10f8cd1d: Merge changes Ia15b2110,I5498c725 
* commit '10f8cd1d87eccde36da2ac54ad7d390e34a6e224':
  Add ability to adjust init log level at runtime.
  Improve init's debug printing.
 2014-06-27 03:40:01 +00:00
Daniel Rosenberg
f67d6bd3c0 Moved symlink back up. 
Moving the vendor symlink down was causing issues with some devices.
Moved it back up, and adjusted mount to remove symlinks if necessary.

Change-Id: I77126d77cfbef32250012bea3960c99b55db4cbb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-06-26 22:07:37 +00:00
Narayan Kamath
6e074c68e2 Merge "Build pixelflinger tests as native tests, not executables." 2014-06-26 21:17:59 +00:00
Elliott Hughes
e080be5754 Merge "Fixed tid/pid mixup in debuggerd gdbclient output." 2014-06-26 18:34:59 +00:00
Brigid Smith
75582957cf Fixed tid/pid mixup in debuggerd gdbclient output. 
Now the debugging output shows the tid of the crashed thread instead of
the pid of the process that crashed.

Change-Id: I637f409ff02d73d458edc6d1a5c462c21d128211
 2014-06-27 09:21:12 -07:00
Riley Andrews
10f8cd1d87 Merge changes Ia15b2110,I5498c725 
* changes:
  Add ability to adjust init log level at runtime.
  Improve init's debug printing.
 2014-06-26 17:56:55 +00:00
Riley Andrews
1bbef88e80 Add ability to adjust init log level at runtime. 
+ Add a new property, sys.init_log_level, which can be set after init
  bootstrap. This will control the level at which init does prints to klog.

Change-Id: Ia15b2110157b5e6b713785ece9b0fb94889be6c8
 2014-06-26 15:05:20 -07:00