summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add proxy as another network.Hui Lu2014-01-303-2/+136
| | | | Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
* am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse ↵Elliott Hughes2014-01-181-1/+1
|\ | | | | | | | | | | | | stat and stat64." * commit '8815d261d9fefbac8f24936dc37a055ab9ced038': Don't confuse stat and stat64.
| * am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."Elliott Hughes2014-01-181-1/+1
| |\ | | | | | | | | | | | | * commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052': Don't confuse stat and stat64.
| | * am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."Elliott Hughes2014-01-171-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit 'aa80f1a3caf6271f1c48a779e260811f2802a9f0': Don't confuse stat and stat64.
| | | * am c9a60b0f: Merge "Don\'t confuse stat and stat64."Elliott Hughes2014-01-171-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'c9a60b0f77525244ac4f970258703b8dc62ee140': Don't confuse stat and stat64.
| | | | * Merge "Don't confuse stat and stat64."Elliott Hughes2014-01-181-1/+1
| | | | |\
| | | | | * Don't confuse stat and stat64.Elliott Hughes2014-01-171-1/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 11865851 Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
* | | | | Merge "Refactor display manager service to new pattern." into klp-modular-devJeff Brown2014-01-1825-628/+880
|\ \ \ \ \
| * | | | | Refactor display manager service to new pattern.Jeff Brown2014-01-1625-628/+880
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform DisplayManagerService into a SystemService and start cleaning up other local services that it uses from window manager and input manager. Clean up service thread initialization. Remove unnecessary static variables from ActivityManagerService. It's starting to become clear that we really need a better way to manage service dependencies. Boot phases don't quite cut it. Change-Id: If319dbd7cbfbd4812fe55ece969e818d4b20755b
* | | | | | am 38cf0704: am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize ↵Chris Craik2014-01-171-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | pointer members to NULL to avoid illegal reference" * commit '38cf0704f6fbfa6d41d5d10488ce25e645adb835': Initialize pointer members to NULL to avoid illegal reference
| * | | | | am e9a7d229: am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to ↵Chris Craik2014-01-171-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | NULL to avoid illegal reference" * commit 'e9a7d22963739bfdace392b9a1707cb0936d25b3': Initialize pointer members to NULL to avoid illegal reference
| | * | | | am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid ↵Chris Craik2014-01-171-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | illegal reference" * commit '66b5a2b25bbe9844fc538e383922a0866c0baec0': Initialize pointer members to NULL to avoid illegal reference
| | | * | | am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal ↵Chris Craik2014-01-171-1/+1
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | reference" * commit '5150eb8f5f66104a8bc0884f9eb348e3f08ee6fb': Initialize pointer members to NULL to avoid illegal reference
| | | | * | Merge "Initialize pointer members to NULL to avoid illegal reference"Chris Craik2014-01-171-1/+1
| | | | |\ \
| | | | | * | Initialize pointer members to NULL to avoid illegal referencelina.x.pi2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mBitmap and mTexture is not initialized to NULL which causes illegal address access when it fails to be created from oversized bitmap. Change-Id: Iea54bec8788bc5f3a10040fdb43f416c0d41a14c
* | | | | | | am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error ↵Narayan Kamath2014-01-171-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checking in MemoryFile." * commit '766c95be6f3eb33f40241058c0503123e334050f': Fix error checking in MemoryFile.
| * | | | | | am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."Narayan Kamath2014-01-171-4/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160': Fix error checking in MemoryFile.
| | * | | | | am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."Narayan Kamath2014-01-171-4/+5
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '251de854f02a22ae613964de7ec96f2e0816e503': Fix error checking in MemoryFile.
| | | * | | | am 53e9bfae: Merge "Fix error checking in MemoryFile."Narayan Kamath2014-01-171-4/+5
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '53e9bfaee1064f1858c307409e51aa4566ae4b95': Fix error checking in MemoryFile.
| | | | * | | Merge "Fix error checking in MemoryFile."Narayan Kamath2014-01-171-4/+5
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Fix error checking in MemoryFile.Narayan Kamath2014-01-161-4/+5
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmap returns MAP_FAILED on failures, not 0 (NULL). Also, convert some C style casts to C++ since they make intent clearer. Change-Id: I367993c73e9ee576f11ebe76e530d2c2f27c662d
* | | | | | am 6104a749: am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note ↵Joe Fernandez2014-01-161-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs * commit '6104a749b2d02a8961b694619aee59cd0795e976': docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
| * | | | | am 12382d13: am fcab250d: am 16fe3737: Merge "docs: Added note to Support ↵Joe Fernandez2014-01-161-0/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library Setup page: mediarouter to appcompat dependency" into klp-docs * commit '12382d13ff70c591ee31ed6b9004298a037b38e9': docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
| | * | | | am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup ↵Joe Fernandez2014-01-161-0/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page: mediarouter to appcompat dependency" into klp-docs * commit 'fcab250de89352613e3dd8fe6efa180c0a7df4d0': docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
| | | * \ \ \ am 16fe3737: Merge "docs: Added note to Support Library Setup page: ↵Joe Fernandez2014-01-161-0/+8
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediarouter to appcompat dependency" into klp-docs * commit '16fe3737457ac844da09cd062e23abedbcc1f3e8': docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
| | | | * \ \ \ Merge "docs: Added note to Support Library Setup page: mediarouter to ↵Joe Fernandez2014-01-161-0/+8
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | appcompat dependency" into klp-docs
| | | | | * | | | docs: Added note to Support Library Setup page: mediarouter to appcompat ↵Joe Fernandez2014-01-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency The v7 mediarouter support library depends on a couple of styles that are located in the v7 appcompat library. This dependency requires developers to have both libraries imported in their Eclipse workspace and to set up a library dependency between the mediarouter to the appcompat library. See Stackoverflow for issue and fix: http://goo.gl/xQI0Iw Staging: http://joefernandez2.mtv.corp.google.com:8208/tools/support-library/setup.html#libs-with-res Change-Id: Ifc7fa3dfcf9dfdb7faac7d2695a9988d49440c7d
* | | | | | | | | am 102e382f: am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in ↵Joe Fernandez2014-01-161-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | MediaPlayer docs" into klp-docs * commit '102e382f26bafe1839c977be6162ccaffc2af578': Fixing bugs in MediaPlayer docs
| * | | | | | | am 75a09a75: am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer ↵Joe Fernandez2014-01-161-7/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs" into klp-docs * commit '75a09a752aaf276cc3defee2874270cd20bd8a69': Fixing bugs in MediaPlayer docs
| | * | | | | | am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docsJoe Fernandez2014-01-161-7/+7
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '94149cfb3409244fa2d91ee87c0b4d531447110a': Fixing bugs in MediaPlayer docs
| | | * | | | | am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docsJoe Fernandez2014-01-161-7/+7
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'acf2b906b34d7c1d16ecb039390f656784c6d034': Fixing bugs in MediaPlayer docs
| | | | * | | | Merge "Fixing bugs in MediaPlayer docs" into klp-docsJoe Fernandez2014-01-161-7/+7
| | | | |\ \ \ \
| | | | | * | | | Fixing bugs in MediaPlayer docsJoe Fernandez2014-01-061-7/+7
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - b/5967189 - b/10641397 Change-Id: Id21c3f13c312a3e5d5898d2be7855599cb8beff8
* | | | | | | | Start untangling system server early bootstrapping.Jeff Brown2014-01-1618-797/+975
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored SystemServer to get rid of a bunch of legacy cruft related to how the ServerThread used to be started up. Create system context first when system server starts. This removes the tangled initialization order dependency that forced us to start the activity manager service before most anything else. Moved factory test related constants into the FactoryTest class. Partially migrated Installer, ActivityManagerService, and PowerManagerService to the new SystemService pattern. There's more work to be done here, particularly around the lifecycle of the power manager. Bug: 12172368 Change-Id: Ia527dd56e3b3fd90f9eeb41289dbe044921230d4
* | | | | | | | Delete unused power manager functionality.Jeff Brown2014-01-161-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeSinceScreenWasLastOn() was used by Watchdog previously but is no longer so we can remove it. Change-Id: I91c324b6c98c1aeb85f64b0296a41240e6c2ef4f
* | | | | | | | am aa141fb0: am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed ↵quddusc2014-01-162-9/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs * commit 'aa141fb0d9c7938df317954054ba87e16595e4e7': docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
| * | | | | | | am c2cc2999: am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete ↵quddusc2014-01-162-9/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs * commit 'c2cc2999983d221b293d561dd6af8ac0820266c4': docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
| | * | | | | | am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play ↵quddusc2014-01-162-9/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store purchase flow. Bug: 9846095" into klp-docs * commit '7e8a997fdf8acb90d81d57e1563a8d9f858464bd': docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
| | | * | | | | am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase ↵quddusc2014-01-162-9/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flow. Bug: 9846095" into klp-docs * commit '62729b15a91525cef4dd27226099c245d38e6495': docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
| | | | * | | | Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: ↵quddusc2014-01-162-9/+1
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 9846095" into klp-docs
| | | | | * | | | docs: Removed obsolete screenshot of Play Store purchase flow.quddusc2014-01-152-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9846095 Change-Id: Ia3a7b69007964e73ee3ffe4825795814d3341340
* | | | | | | | | am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long ↵Narayan Kamath2014-01-168-60/+60
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for pointers in view/input classes" * commit 'd8facb6763638178bd12f1010466e426c0754f49': AArch64: Use long for pointers in view/input classes
| * | | | | | | | am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-168-60/+60
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in view/input classes" * commit 'd569e21dac38fffe0e6a7f935e9a6965495b87d4': AArch64: Use long for pointers in view/input classes
| | * | | | | | | am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-01-168-60/+60
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | view/input classes" * commit '48de490c33cac16ed82d753799d7add804f72977': AArch64: Use long for pointers in view/input classes
| | | * | | | | | am 486544f7: Merge "AArch64: Use long for pointers in view/input classes"Narayan Kamath2014-01-168-60/+60
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit '486544f763bd27eb92c95101e23f939c79c9890e': AArch64: Use long for pointers in view/input classes
| | | | * | | | | Merge "AArch64: Use long for pointers in view/input classes"Narayan Kamath2014-01-168-60/+60
| | | | |\ \ \ \ \
| | | | | * | | | | AArch64: Use long for pointers in view/input classesAshok Bhat2014-01-098-60/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in view/input classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Iafda9f4653c023bcba95b873637d935d0b569f5d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | | | | | | | am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long ↵Narayan Kamath2014-01-162-20/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for pointers in android/os/MessageQueue" * commit '7471dfc4a894ade4cd83949d2b59b9b7e75bbf92': AArch64: Use long for pointers in android/os/MessageQueue
| * | | | | | | | | am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers ↵Narayan Kamath2014-01-162-20/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in android/os/MessageQueue" * commit '42defa02337b94d25714fe737f749f2c3300c790': AArch64: Use long for pointers in android/os/MessageQueue
| | * | | | | | | | am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in ↵Narayan Kamath2014-01-162-20/+20
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android/os/MessageQueue" * commit 'faa62aaca5f4a149f20487d42279fefc7d356428': AArch64: Use long for pointers in android/os/MessageQueue
generated by cgit v1.1 at 2025-03-31 02:28:10 +0000