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

3032 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christopher Tate
650307df33 am b1dfffe6: Fix \'adb backup\' on Windows 
* commit 'b1dfffe6bb506313a3bc9146d2f6f8c533213193':
  Fix 'adb backup' on Windows
 2011-12-09 16:56:21 -08:00
Christopher Tate
b1dfffe6bb Fix 'adb backup' on Windows 
Use the same call sequence that 'adb pull' uses for creating the
output file.  adb_open_mode() apparently does not work on Windows
hosts.

Bug 5733007

Change-Id: I48d719c4657c93e19f6790cf1c6da610d49f5806
 2011-12-09 15:29:30 -08:00
The Android Open Source Project
336658c321 Reconcile with ics-mr1-release 
Change-Id: I90f80bed70319b9973996b74f78b421b87eef8e7
 2011-12-08 10:22:22 -08:00
The Android Automerger
0d0c0ce6ba merge in ics-mr1-release history after reset to ics-mr1 2011-12-05 20:36:43 -08:00
Vladimir Chtchetkine
e64ad60aaf am ce48083f: Fixes ADB crash on Windows due to large number of connections. do not merge. 
* commit 'ce48083fc90cee807dd66608e2c3e496145af9ff':
  Fixes ADB crash on Windows due to large number of connections. do not merge.
 2011-12-05 13:16:53 -08:00
Vladimir Chtchetkine
ce48083fc9 Fixes ADB crash on Windows due to large number of connections. do not merge. 
The reason for the crash is that ADB on Windows uses WaitForMultipleObjects to
wait on connection events. When number of connections exceeds 64, ADB crashes,
because WaitForMultipleObjects API doesn't support more than 64 handles. This
CL contains a fixer routine that allows waiting on an arbitrary number of
handles.

(cherry picked from commit ac52833e48)

Change-Id: I8ad264765e5b38d01a31e42b445f97ea86e49948
 2011-12-05 13:14:23 -08:00
The Android Automerger
999a193181 merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:23:45 -08:00
The Android Automerger
a985651967 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:57:10 -08:00
Nick Pelly
3d547e0dda am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 
* commit 'f9c1fcc505d59fd87392e6af7341b1737f186081':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk
 2011-11-21 16:05:27 -08:00
Nick Pelly
f9c1fcc505 Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 2011-11-21 16:03:43 -08:00
Nick Pelly
097b4ed410 Replace vendor specific NfcGoogle.apk with generic Nfc.apk 
The access control changes allow us to just use Nfc.apk with
the regular platform certificate, instead of the custom signed
NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle
and just build it out of packages/apps/Nfc now.

The package name is also reverted from com.android.nfc3 to com.android.nfc

The NFC uid needs to get bumped (25 to 27) to allow the cert change.

Bug: 5608249
Change-Id: I5e178b469e5210cd231ba5f4ea57aa666b3d8893
 2011-11-21 14:55:59 -08:00
Andy McFadden
c96d2aeed7 am 2a38657d: Merge "DO NOT MERGE - disable memory dumps" into ics-mr1 
* commit '2a38657dfcb5655e3e900a3d25695864f3d023a3':
  DO NOT MERGE - disable memory dumps
 2011-11-17 09:50:15 -08:00
Andy McFadden
2a38657dfc Merge "DO NOT MERGE - disable memory dumps" into ics-mr1 2011-11-17 09:48:03 -08:00
Andy McFadden
ecf0e9e53a DO NOT MERGE - disable memory dumps 
This disables the hex dumps of memory for registers other than PC
and LR.

Bug 5484924

Change-Id: I26cff857e5d01ed30548ca3e55bdddd63b592c0c
 2011-11-16 15:50:55 -08:00
The Android Open Source Project
e363d387a4 am b90cb1d2: am c6023243: Reconcile with ics-factoryrom-2-release 
* commit 'b90cb1d20c7d5701e073bf5293a64bfa57861782':
 2011-11-16 09:48:22 -08:00
The Android Open Source Project
b90cb1d20c am c6023243: Reconcile with ics-factoryrom-2-release 
* commit 'c60232434c941b5175a9ebb542b1c872866d3409':
 2011-11-16 09:33:01 -08:00
The Android Open Source Project
c60232434c Reconcile with ics-factoryrom-2-release 
Change-Id: I9671d18aeee882196d56644533c962942c4fbb70
 2011-11-16 08:56:49 -08:00
Steve Block
67b11cba5b am 25a89e77: Fix build 
* commit '25a89e771aae292193244852166564e83e36232b':
  Fix build
 2011-11-15 11:10:09 -08:00
Steve Block
25a89e771a Fix build 
Change-Id: Icbe57024e6018600d47a68132f53f15d7602dc92
 2011-11-15 10:58:49 -08:00
The Android Automerger
0026371fcf merge in ics-mr1-release history after reset to ics-mr1 2011-11-10 06:47:41 -08:00
JP Abgrall
1351edeb56 am 61b90bd2: adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats 
* commit '61b90bd211021886049f72cb666a5b49b83b3c64':
  adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats
 2011-11-09 18:59:17 +00:00
JP Abgrall
61b90bd211 adb: grant it AID_NET_BW_STATS for full /proc/net/xt_qtaguid/stats 
Normally only bandwidth stats for the uid reading .../stats is returned.
With the extra group, adb shell will be able to read stats from
all UIDs.
This is to be used to offer data usage profiling to developers.

Change-Id: If3d2941ce5aa4dbb1a23947b97b893149ba224f7
 2011-11-09 10:30:08 -08:00
The Android Automerger
989b2a3a55 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:48:04 -08:00
Robert Greenwalt
39b6df11dc am c761b54e: Merge "Wimax: wimax related changes for libnetutils" into ics-mr1 
* commit 'c761b54ead5ec3f22fafb7ce50dd5c5a1939b03f':
  Wimax: wimax related changes for libnetutils
 2011-11-08 18:03:47 +00:00
Robert Greenwalt
c761b54ead Merge "Wimax: wimax related changes for libnetutils" into ics-mr1 2011-11-08 10:02:01 -08:00
The Android Automerger
7938d6d79f merge in ics-mr1-release history after reset to ics-mr1 2011-11-08 06:46:45 -08:00
tk.mun
ed21633a5e Wimax: wimax related changes for libnetutils 
- Modified dhcp renew code for the new conenctivity changes in ICS

Change-Id: I614dfc62a875b79dbd8b7c46f4d87f366a3c3661
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
 2011-11-07 17:15:19 -08:00
Dima Zavin
75e488841d am 3c58933a: am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd 
* commit '3c58933aa785ab26f77284f6a1a4e93d2ebfcf04':
  rootdir: init.rc: write default oom_adj before starting ueventd
 2011-11-07 17:33:49 +00:00
Dima Zavin
3c58933aa7 am 4a253908: rootdir: init.rc: write default oom_adj before starting ueventd 
* commit '4a2539085062a715b0d345eb50ea48738423c909':
  rootdir: init.rc: write default oom_adj before starting ueventd
 2011-11-07 17:32:02 +00:00
Dima Zavin
4a25390850 rootdir: init.rc: write default oom_adj before starting ueventd 
Otherwise, ueventd's oom_adj value would have been 0 and it could
easily get killed early during low memory events

Change-Id: I1adbd18c37215b26ae77e70f7b8dbd1e143fc2d4
Signed-off-by: Dima Zavin <dima@android.com>
 2011-11-04 12:45:56 -07:00
The Android Open Source Project
99436ca879 am 6182d031: Reconcile with ics-factoryrom-2-release 
* commit '6182d031d7a1968c2edc8862bb5a9bc5bc8922e9':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
 2011-11-04 14:58:27 +00:00
The Android Open Source Project
6182d031d7 Reconcile with ics-factoryrom-2-release 
Change-Id: If9c35eae1d56a9fc9017c0ae6626466579a4ac96
 2011-11-04 07:57:25 -07:00
The Android Automerger
b1966c5e76 Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0" 
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
 2011-11-02 21:04:38 -07:00
The Android Automerger
08ffd07a88 Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0" 
This reverts commit 6fb3df8d46, reversing
changes made to d4f29767c8.
 2011-11-02 21:04:22 -07:00
The Android Automerger
86eeea5ce8 Revert "Merge "Remove log spam" into ics-mr0" 
This reverts commit d4f29767c8, reversing
changes made to 604f52e313.
 2011-11-02 21:04:09 -07:00
The Android Automerger
23420745e2 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 20:53:30 -07:00
The Android Open Source Project
03d7ffc1c8 am 0e4d9eb8: Reconcile with ics-factoryrom-2-release 
* commit '0e4d9eb8f89be601d8b499e5fe40e2a25fca1bce':
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
  Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
  Revert "Merge "Remove log spam" into ics-mr0"
  Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
 2011-11-02 17:56:13 +00:00
The Android Open Source Project
0e4d9eb8f8 Reconcile with ics-factoryrom-2-release 
Change-Id: Ibfe7c2c1d309f7caae0be71ae631b69830f4e624
 2011-11-02 10:53:31 -07:00
The Android Automerger
6641b39923 Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0" 
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
 2011-11-02 10:18:15 -07:00
The Android Automerger
fa792b19cc Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0" 
This reverts commit 6fb3df8d46, reversing
changes made to d4f29767c8.
 2011-11-02 10:18:01 -07:00
The Android Automerger
77aa295272 Revert "Merge "Remove log spam" into ics-mr0" 
This reverts commit d4f29767c8, reversing
changes made to 604f52e313.
 2011-11-02 10:17:46 -07:00
The Android Automerger
df241e54ae merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 09:48:57 -07:00
The Android Automerger
3d695243b2 merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:47:10 -07:00
The Android Automerger
6d9f02302d Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0" 
This reverts commit 4f7c0843bb, reversing
changes made to 6fb3df8d46.
 2011-11-02 04:41:24 -07:00
Dmitry Shmidt
0382934575 am e7184667: am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0 
* commit 'e71846671e6dbb2ece3142be92b33ff85f713997':
  libnl_2: Fix memory leaks
 2011-11-02 00:14:58 +00:00
Dmitry Shmidt
e71846671e am 4f7c0843: Merge "libnl_2: Fix memory leaks" into ics-mr0 
* commit '4f7c0843bbaa9cb4ec3a7890461cebbee689530a':
  libnl_2: Fix memory leaks
 2011-11-02 00:13:04 +00:00
Dmitry Shmidt
4f7c0843bb Merge "libnl_2: Fix memory leaks" into ics-mr0 2011-11-01 17:12:02 -07:00
Dmitry Shmidt
d99fe5ec96 libnl_2: Fix memory leaks 
BUG: b/5532633

Change-Id: I271168764e26dc465d2442f5015338a3e9a479b8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2011-11-01 15:56:22 -07:00
Dima Zavin
1d6a0a2ee6 am 3e3d0780: am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0 
* commit '3e3d0780fcc8da7f9917b3f9d05e16ffc08d4b6f':
  charger: make the almost-full frame only show when it's current level
 2011-11-01 22:32:41 +00:00
Dima Zavin
3e3d0780fc am 6fb3df8d: Merge "charger: make the almost-full frame only show when it\'s current level" into ics-mr0 
* commit '6fb3df8d468a105b49c1cdbbdcb061dc8de022a4':
  charger: make the almost-full frame only show when it's current level
 2011-11-01 22:30:25 +00:00