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

4303 commits

This branch
This branch
All branches
Author SHA1 Message Date
The Android Open Source Project
bd82e3293c Reconcile with jb-mr1-release - do not merge 
Change-Id: Ia5d484b16bf45e3a8481bf5c81864474749f964e
 2012-08-22 15:36:44 -07:00
Jeff Sharkey
ecee9934af am f70c6da4: Merge "Remove sdcard groups from services." into jb-mr1-dev 
* commit 'f70c6da41ef13146b85e1101d1e708cd35f81b78':
  Remove sdcard groups from services.
 2012-08-22 15:01:56 -07:00
Jeff Sharkey
f70c6da41e Merge "Remove sdcard groups from services." into jb-mr1-dev 2012-08-22 15:00:30 -07:00
Brian Carlstrom
5e3d90c8be Revert "Upgrade to dlmalloc 2.8.5." 
This reverts commit 2d13791ce7.
 2012-08-22 14:57:54 -07:00
James Dong
86e21a1d24 am 8ccaed6a: Merge "Don\'t give drmserver read permission to local storage" into jb-mr1-dev 
* commit '8ccaed6a29d7371f614e94f28b68e476064fc959':
  Don't give drmserver read permission to local storage
 2012-08-22 14:52:08 -07:00
James Dong
8ccaed6a29 Merge "Don't give drmserver read permission to local storage" into jb-mr1-dev 2012-08-22 14:50:31 -07:00
Brian Carlstrom
23f4ead81c am 42b83c6d: Revert "Upgrade to dlmalloc 2.8.5." 
* commit '42b83c6df7e4f65461a32a711d5dd4f46b9b85e0':
  Revert "Upgrade to dlmalloc 2.8.5."
 2012-08-22 13:55:09 -07:00
Brian Carlstrom
42b83c6df7 Revert "Upgrade to dlmalloc 2.8.5." 
This reverts commit 2d13791ce7.
 2012-08-22 12:10:19 -07:00
The Android Automerger
6e648d9254 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-22 06:34:36 -07:00
Erik Gilling
d5f149b3f5 am 984d3570: update libsync to support new timeout semantics 
* commit '984d35703d5c6738253193bd53da9dedb3b58243':
  update libsync to support new timeout semantics
 2012-08-21 19:11:04 -07:00
Erik Gilling
984d35703d update libsync to support new timeout semantics 
Change-Id: Ibedbd261bb96a84785c4e679b6fc4061287d5d7d
 2012-08-21 18:21:18 -07:00
The Android Open Source Project
161c1cc8ef Reconcile with jb-mr1-release - do not merge 
Change-Id: Ie51b5f85342674d507d7db2e7fb681f0f4088693
 2012-08-21 16:07:37 -07:00
Jean-Baptiste Queru
8fde167ba2 am 6302b420: am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile" 
* commit '6302b420554724c1434e27e2cd46cb43f5fb7bca':
  Fixed warnings test_zipfile
 2012-08-21 09:13:12 -07:00
Jean-Baptiste Queru
ba6d63e093 am a4ad7348: am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test" 
* commit 'a4ad73480896c6bc7960331dcfca87a358cc5782':
  Fixing unused param warnings in sync_test
 2012-08-21 09:13:11 -07:00
Jean-Baptiste Queru
6302b42055 am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile" 
* commit '487d6d3db3f504b0120fc605ad3a4155ca214674':
  Fixed warnings test_zipfile
 2012-08-21 09:12:13 -07:00
Jean-Baptiste Queru
a4ad734808 am 00f06911: am c6620cb3: Merge "Fixing unused param warnings in sync_test" 
* commit '00f0691107dfde589bd23a7d079b4e05998833b0':
  Fixing unused param warnings in sync_test
 2012-08-21 09:12:12 -07:00
Jean-Baptiste Queru
487d6d3db3 am 02fd2924: Merge "Fixed warnings test_zipfile" 
* commit '02fd29246ab54ee4a0f8fa6358498070e54e5fd0':
  Fixed warnings test_zipfile
 2012-08-21 09:10:03 -07:00
Jean-Baptiste Queru
00f0691107 am c6620cb3: Merge "Fixing unused param warnings in sync_test" 
* commit 'c6620cb3a37e98ceb89f5d11305038786af76650':
  Fixing unused param warnings in sync_test
 2012-08-21 09:10:02 -07:00
Jean-Baptiste Queru
02fd29246a Merge "Fixed warnings test_zipfile" 2012-08-21 08:09:07 -07:00
Jean-Baptiste Queru
c6620cb3a3 Merge "Fixing unused param warnings in sync_test" 2012-08-21 08:08:55 -07:00
The Android Automerger
c5a4eb547e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-21 06:35:28 -07:00
Benoit Goby
3828994216 am 3fc95a99: Revert "adb: Add public key authentification" 
* commit '3fc95a991805feba257a396c13548776fd36f34f':
  Revert "adb: Add public key authentification"
 2012-08-21 00:48:32 -07:00
Benoit Goby
3fc95a9918 Revert "adb: Add public key authentification" 
This reverts commit f4ed516643.
 2012-08-20 23:04:11 -07:00
Benoit Goby
271add57ae am 300d6d65: Merge "adb: Add public key authentification" into jb-mr1-dev 
* commit '300d6d65d022c4a4663d097e5271eac745be6278':
  adb: Add public key authentification
 2012-08-20 20:30:26 -07:00
Benoit Goby
300d6d65d0 Merge "adb: Add public key authentification" into jb-mr1-dev 2012-08-20 20:28:51 -07:00
Brian Carlstrom
bc773686b1 am 17687079: am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5." 
* commit '17687079519c9014ee6c5ad2d13c3163d40a02ce':
  Upgrade to dlmalloc 2.8.5.
 2012-08-20 17:06:32 -07:00
Brian Carlstrom
1768707951 am e05ac541: am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5." 
* commit 'e05ac5415e861dee6a3f175c8066ff577736ba1f':
  Upgrade to dlmalloc 2.8.5.
 2012-08-20 17:04:24 -07:00
Brian Carlstrom
e05ac5415e am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5." 
* commit '9d779bf1ea587dc70b74fd1f8798894a8695e78b':
  Upgrade to dlmalloc 2.8.5.
 2012-08-20 17:02:20 -07:00
John Grossman
a0a46170f1 am 9dd0029a: Merge "Replace a segfault with a warning." into jb-mr1-dev 
* commit '9dd0029a05511d5e15c7fdb453b93f50d5b37d04':
  Replace a segfault with a warning.
 2012-08-20 16:49:40 -07:00
John Grossman
9dd0029a05 Merge "Replace a segfault with a warning." into jb-mr1-dev 2012-08-20 16:48:13 -07:00
John Grossman
9367f4f973 Replace a segfault with a warning. 
Just print a warning if ADB_EXTERNAL_STORAGE is not defined when ADB
runs instead of segfaulting.  If we really don't want to continue to
run, we can make this a fatal error instead.

Change-Id: Icfc5fb9e594b0a310029f1dca7e9476f27ceb7bc
 2012-08-20 16:38:01 -07:00
Brian Carlstrom
9d779bf1ea Merge "Upgrade to dlmalloc 2.8.5." 2012-08-20 16:12:35 -07:00
Ian Rogers
2d13791ce7 Upgrade to dlmalloc 2.8.5. 
Remove mspace functionality from cutils.
Directly declare mspace from dlmalloc in code flinger's code cache, and
manage without using morecore.

Depends upon: https://android-review.googlesource.com/41717

Change-Id: If927254febd4414212c690f16509ef2ee1b44b44
 2012-08-20 15:30:35 -07:00
Jean-Baptiste Queru
95ddeb0eb7 am a8b832a8: am 42900c30: am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p" 
* commit 'a8b832a89713dea6d1a82cfc8ecfa624c4fc5783':
  adb: Pick desired product value from command line it follows -p
 2012-08-20 14:53:05 -07:00
Jean-Baptiste Queru
81eecb1eb8 am 2ab69388: am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag" 
* commit '2ab69388cb4e26855cc7a9f3584935b927a3659e':
  vmstat: Fix -n flag
 2012-08-20 14:53:04 -07:00
Jean-Baptiste Queru
66cb61c8ff am 93058924: am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." 
* commit '9305892464fc353702345eedcb2180f5e6fb27c0':
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
 2012-08-20 14:53:03 -07:00
Jean-Baptiste Queru
a8b832a897 am 42900c30: am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p" 
* commit '42900c30cf39ea4cdc41cc3671584b7f4f39b8bc':
  adb: Pick desired product value from command line it follows -p
 2012-08-20 14:51:53 -07:00
Jean-Baptiste Queru
2ab69388cb am 76080925: am 52d5dfc8: Merge "vmstat: Fix -n flag" 
* commit '76080925410db41cfa5c70ffcffaa2b3b4d59aad':
  vmstat: Fix -n flag
 2012-08-20 14:51:52 -07:00
Jean-Baptiste Queru
9305892464 am 1bcced2b: am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." 
* commit '1bcced2bb67a4024035d5303d953c793b857f275':
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
 2012-08-20 14:51:51 -07:00
Jean-Baptiste Queru
42900c30cf am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p" 
* commit '0874aa0ec4f413a77a610133c904c2590a2e3ccd':
  adb: Pick desired product value from command line it follows -p
 2012-08-20 14:50:36 -07:00
Jean-Baptiste Queru
7608092541 am 52d5dfc8: Merge "vmstat: Fix -n flag" 
* commit '52d5dfc8d30890734ee7122c3139f8637e196a1c':
  vmstat: Fix -n flag
 2012-08-20 14:50:35 -07:00
Jean-Baptiste Queru
1bcced2bb6 am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." 
* commit 'c57689fc7ccadee4f852ad62ac1010e53382a67c':
  add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
 2012-08-20 14:50:34 -07:00
Jean-Baptiste Queru
0874aa0ec4 Merge "adb: Pick desired product value from command line it follows -p" 2012-08-20 14:41:25 -07:00
Jeff Sharkey
61f1359486 Remove sdcard groups from services. 
Even with the groups, services no longer have access.

Change-Id: I2b4871b276ffd309c08c404b1211b33406dbebd5
 2012-08-20 14:31:47 -07:00
Jean-Baptiste Queru
52d5dfc8d3 Merge "vmstat: Fix -n flag" 2012-08-20 14:25:13 -07:00
Jean-Baptiste Queru
c57689fc7c Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." 2012-08-20 14:24:56 -07:00
Ariel Bernal
62188564fa Fixed warnings test_zipfile 
Fixed implicit declaration of strcmp warning
Fixed switch case of enumeration not handled

Change-Id: Ic3f3690a2e749235b1b0dffd252b119855ad36c0
Author: Ariel Bernal <ariel.j.bernal@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
 2012-08-20 16:38:37 -04:00
Jeff Brown
8fb50b4abe am a8c2112b: Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev 
* commit 'a8c2112be672409a81f200c110f901fda4907bde':
  Migrate sdcard0 to shell-accessible location.
 2012-08-20 13:17:04 -07:00
Jeff Brown
a8c2112be6 Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev 2012-08-20 13:15:39 -07:00
Jeff Sharkey
5dd0f86fbf Migrate sdcard0 to shell-accessible location. 
Also remove mount() from adb, since it can come online long before
data partition is ready.  Set EXTERNAL_STORAGE environment variable
to point to owner for backwards compatibility.

Bug: 7005701
Change-Id: I63444f6636624eb7ad89f053daa289663424639e
 2012-08-20 13:11:11 -07:00