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

15589 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Salyzyn
eb3aff3db8 am 348d96fa: am e27ee08a: Merge "logd: serialize accesses to stats helpers" into mnc-dev 
* commit '348d96fae741af0017b8fb46041a3b09724eeb83':
  logd: serialize accesses to stats helpers
 2015-06-25 16:10:34 +00:00
Yusuke Sato
28bfde794f am 57a4640f: am 5c8f6f22: Merge "Add |optional_suffix| to StartIteration()" into mnc-dev 
* commit '57a4640f8a12bb5cad83ca5df6c33385f6e4bf1f':
  Add |optional_suffix| to StartIteration()
 2015-06-25 16:10:33 +00:00
Mark Salyzyn
b6c65bcc68 am ff688ffd: am f32bc723: am 3c233b36: Merge "logd: serialize accesses to stats helpers" 
* commit 'ff688ffd04aeea4af07282afa113aec5d259f8ae':
  logd: serialize accesses to stats helpers
 2015-06-25 16:03:35 +00:00
Mark Salyzyn
348d96fae7 am e27ee08a: Merge "logd: serialize accesses to stats helpers" into mnc-dev 
* commit 'e27ee08abb6b2b7a0d31dda4065c4c639b05ab16':
  logd: serialize accesses to stats helpers
 2015-06-25 16:02:05 +00:00
Yusuke Sato
57a4640f8a am 5c8f6f22: Merge "Add |optional_suffix| to StartIteration()" into mnc-dev 
* commit '5c8f6f22c52dca2ff968b2bf654c340006b0b240':
  Add |optional_suffix| to StartIteration()
 2015-06-25 16:02:04 +00:00
Mark Salyzyn
ff688ffd04 am f32bc723: am 3c233b36: Merge "logd: serialize accesses to stats helpers" 
* commit 'f32bc723f06d61d31cc611a3cdf8e9ac5f827fdb':
  logd: serialize accesses to stats helpers
 2015-06-25 15:52:43 +00:00
Mark Salyzyn
f32bc723f0 am 3c233b36: Merge "logd: serialize accesses to stats helpers" 
* commit '3c233b36c2ffd6e1186ccc3d2c7c7e40b0a3c066':
  logd: serialize accesses to stats helpers
 2015-06-25 15:39:29 +00:00
Mark Salyzyn
e27ee08abb Merge "logd: serialize accesses to stats helpers" into mnc-dev 2015-06-25 15:35:45 +00:00
Mark Salyzyn
5803b79528 logd: serialize accesses to stats helpers 
(cherry pick from commit ed777e9eec)

Quick low-risk to resolve possible hash table corruption.
Resolved an unlikely path memory leak.

ToDo: replace lock with nested lock so no lock
      helpers are required.

Bug: 22068332
Change-Id: I303ab06608502c7d61d42f111a9c43366f184d0c
 2015-06-25 08:34:06 -07:00
Mark Salyzyn
3c233b36c2 Merge "logd: serialize accesses to stats helpers" 2015-06-25 15:32:29 +00:00
Yusuke Sato
5c8f6f22c5 Merge "Add |optional_suffix| to StartIteration()" into mnc-dev 2015-06-25 15:22:10 +00:00
Mark Salyzyn
ed777e9eec logd: serialize accesses to stats helpers 
Quick low-risk to resolve possible hash table corruption.
Resolved an unlikely path memory leak.

ToDo: replace lock with nested lock so no lock
      helpers are required.

Bug: 22068332
Change-Id: I303ab06608502c7d61d42f111a9c43366f184d0c
 2015-06-25 07:39:24 -07:00
Dan Albert
d29f2c395f resolved conflicts for merge of c94fa81f to master 
Change-Id: I175c14dbc8719075aaaaa411ab8c493e69da7b87
 2015-06-24 15:31:02 -07:00
Dan Albert
c94fa81f2c am 262be426: Merge "Add missing include. Clang build fix." into mnc-dev 
* commit '262be42687a9095c53dce5e9a63bd1c74ecbdb6a':
  Add missing include. Clang build fix.
 2015-06-24 22:16:16 +00:00
Dan Albert
262be42687 Merge "Add missing include. Clang build fix." into mnc-dev 2015-06-24 21:41:13 +00:00
Elliott Hughes
e4b40fd19b am 90956a20: am 4d2b0716: am 1a3334f2: Merge "Fix Mac fastboot build." 
* commit '90956a2064fc1baa8b5375a7d6d979bcf83909e2':
  Fix Mac fastboot build.
 2015-06-24 20:59:26 +00:00
Elliott Hughes
90956a2064 am 4d2b0716: am 1a3334f2: Merge "Fix Mac fastboot build." 
* commit '4d2b0716c539fd07fd836197655b4768c4bfc3d5':
  Fix Mac fastboot build.
 2015-06-24 20:47:48 +00:00
Elliott Hughes
4d2b0716c5 am 1a3334f2: Merge "Fix Mac fastboot build." 
* commit '1a3334f22965f531449d890c1a97811fa249a754':
  Fix Mac fastboot build.
 2015-06-24 20:40:47 +00:00
Elliott Hughes
1a3334f229 Merge "Fix Mac fastboot build." 2015-06-24 20:28:49 +00:00
Elliott Hughes
fbcb93abe2 Fix Mac fastboot build. 
Change-Id: I516c07cee39845caaa47608604eeb30ce15f06cb
 2015-06-24 13:28:24 -07:00
Elliott Hughes
4bdff2805f am 529bb75f: am 04016450: am 9137d65e: Merge "Improve the "device \'(null)\' not found" error." 
* commit '529bb75f9ff4a36788babb6666e0bb17ab8f99c1':
  Improve the "device '(null)' not found" error.
 2015-06-24 20:08:50 +00:00
Elliott Hughes
eb06fe01f3 am 7d61df8b: am c078d54a: am 75d47421: Merge "Move fastboot\'s Windows code to C++." 
* commit '7d61df8bf7fee1e108572ac4219f21f11e9f74c0':
  Move fastboot's Windows code to C++.
 2015-06-24 20:08:48 +00:00
Elliott Hughes
18a7648be1 am 20370b5f: am cb7f5f51: am feddd582: Merge "Move fastboot\'s Mac OS code to C++." 
* commit '20370b5ffb628b1bd5dc1b5b6ea40d0cb440d01a':
  Move fastboot's Mac OS code to C++.
 2015-06-24 20:08:47 +00:00
Elliott Hughes
529bb75f9f am 04016450: am 9137d65e: Merge "Improve the "device \'(null)\' not found" error." 
* commit '0401645033b0418f9cd6e07768ae3b062aa256ca':
  Improve the "device '(null)' not found" error.
 2015-06-24 19:55:06 +00:00
Elliott Hughes
7d61df8bf7 am c078d54a: am 75d47421: Merge "Move fastboot\'s Windows code to C++." 
* commit 'c078d54adc4342c9573a7b9a8fdc13fb4c83c635':
  Move fastboot's Windows code to C++.
 2015-06-24 19:55:05 +00:00
Elliott Hughes
20370b5ffb am cb7f5f51: am feddd582: Merge "Move fastboot\'s Mac OS code to C++." 
* commit 'cb7f5f511141d80c8a9672cd544b576cabf4e9b6':
  Move fastboot's Mac OS code to C++.
 2015-06-24 19:55:04 +00:00
Elliott Hughes
0401645033 am 9137d65e: Merge "Improve the "device \'(null)\' not found" error." 
* commit '9137d65e9ba7e8a83440e1e2058ad19b2d6b6434':
  Improve the "device '(null)' not found" error.
 2015-06-24 19:42:32 +00:00
Elliott Hughes
c078d54adc am 75d47421: Merge "Move fastboot\'s Windows code to C++." 
* commit '75d47421d0fc1458fad97c32e7fcb6e2d94f3f44':
  Move fastboot's Windows code to C++.
 2015-06-24 19:42:31 +00:00
Elliott Hughes
cb7f5f5111 am feddd582: Merge "Move fastboot\'s Mac OS code to C++." 
* commit 'feddd582e7194e034c291f42528dc3f30d496b53':
  Move fastboot's Mac OS code to C++.
 2015-06-24 19:42:30 +00:00
Elliott Hughes
9137d65e9b Merge "Improve the "device '(null)' not found" error." 2015-06-24 19:31:20 +00:00
Elliott Hughes
75d47421d0 Merge "Move fastboot's Windows code to C++." 2015-06-24 19:30:58 +00:00
Elliott Hughes
feddd582e7 Merge "Move fastboot's Mac OS code to C++." 2015-06-24 19:29:20 +00:00
Andres Morales
db100ff076 am 7f270fa8: am 3c2086da: [gatekeeperd] clear state and mark on cold boot 
* commit '7f270fa8a18c86b8d5451dfcd8936c79115440ef':
  [gatekeeperd] clear state and mark on cold boot
 2015-06-24 18:52:51 +00:00
Andres Morales
7f270fa8a1 am 3c2086da: [gatekeeperd] clear state and mark on cold boot 
* commit '3c2086dabdb87e027412bb4405279128a321e184':
  [gatekeeperd] clear state and mark on cold boot
 2015-06-24 18:33:14 +00:00
Evgenii Stepanov
c25f0dc38b am c7b86c16: am eaa97876: am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 
* commit 'c7b86c1661c7d178784dc2b9f09e478569a2886c':
  SANITIZE_TARGET: set global ASAN_OPTIONS
 2015-06-24 18:30:03 +00:00
Elliott Hughes
20750ad823 Move fastboot's Mac OS code to C++. 
Change-Id: I4f452860a401a115b6e8349237923949f2f476d1
 2015-06-24 11:17:28 -07:00
Evgenii Stepanov
c7b86c1661 am eaa97876: am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 
* commit 'eaa978768beef315c5dca9db964d4e80c462cf74':
  SANITIZE_TARGET: set global ASAN_OPTIONS
 2015-06-24 18:12:24 +00:00
Evgenii Stepanov
eaa978768b am 2e8d31f6: Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 
* commit '2e8d31f6a16819870c26e428098ccd3f32b2b466':
  SANITIZE_TARGET: set global ASAN_OPTIONS
 2015-06-24 17:58:46 +00:00
Evgenii Stepanov
2e8d31f6a1 Merge "SANITIZE_TARGET: set global ASAN_OPTIONS" 2015-06-24 17:48:54 +00:00
Elliott Hughes
c636b64e31 Move fastboot's Windows code to C++. 
Change-Id: I92414594cbdbc1896402c6d950d890042f8df6cf
 2015-06-24 10:48:43 -07:00
Elliott Hughes
e2d3677cc2 Improve the "device '(null)' not found" error. 
Now we'll say "no devices found" if you haven't set ANDROID_SERIAL and
there's no device connected to default to.

Also clean up the relevant code a little.

Change-Id: Id254929629ce0888628d5ba8e67cd996ffbf9c8a
 2015-06-24 10:36:41 -07:00
Andres Morales
3c2086dabd [gatekeeperd] clear state and mark on cold boot 
required to initialize state by certain HAL impls

Bug: 22011857
Change-Id: Ibb01a799da983e1a930aae946c331b23f571861d
 2015-06-24 10:22:45 -07:00
Elliott Hughes
f1ed47e302 am 48815967: am 28369a2d: am dc80d03e: Merge "Move fastboot to C++." 
* commit '4881596789e54b4bb38dc5cb195b7e67b4c88b92':
  Move fastboot to C++.
 2015-06-24 04:59:11 +00:00
Elliott Hughes
4881596789 am 28369a2d: am dc80d03e: Merge "Move fastboot to C++." 
* commit '28369a2d8ab7e011952afb6964c81407bd81a128':
  Move fastboot to C++.
 2015-06-24 04:45:49 +00:00
Elliott Hughes
28369a2d8a am dc80d03e: Merge "Move fastboot to C++." 
* commit 'dc80d03eab1ec5dd300a2a0ee2aa207f67e2ef33':
  Move fastboot to C++.
 2015-06-24 04:34:40 +00:00
Elliott Hughes
dc80d03eab Merge "Move fastboot to C++." 2015-06-24 04:23:29 +00:00
Elliott Hughes
b3748de33f Move fastboot to C++. 
Minimal conversion.

Change-Id: I32cbf125be481a8757720d10fa303c38a7fd5e38
 2015-06-23 20:56:01 -07:00
Yusuke Sato
a4a80693d9 Add |optional_suffix| to StartIteration() 
so that PackageManagerService can iterate over files with a
specific file extension like ".so".

Bug: 21957428
Change-Id: I76ed9560d4d1e00d297a97d518ec357166be1981
 2015-06-23 17:31:16 -07:00
Andres Morales
991680bf60 am 343d7082: am b2856ddb: Merge "[gatekeeperd] invalidate stale password cache" into mnc-dev 
* commit '343d708234636d505653d4ed1c9104463db76bab':
  [gatekeeperd] invalidate stale password cache
 2015-06-23 22:21:15 +00:00
Andres Morales
343d708234 am b2856ddb: Merge "[gatekeeperd] invalidate stale password cache" into mnc-dev 
* commit 'b2856ddbd3555ccffa704496293497f091c2237e':
  [gatekeeperd] invalidate stale password cache
 2015-06-23 21:05:56 +00:00