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

24721 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Willemsen
0a5bbe421f Merge \\\\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\\\" am: 5d420e791b am: bdd01e86a5 am: a5b9b8f452 
am: d377004c98

Change-Id: I9b56d6e84a121120f1c7df054a0bfdc96076aecb
 2016-07-09 06:28:31 +00:00
Dan Willemsen
d377004c98 Merge \\\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\\" am: 5d420e791b am: bdd01e86a5 
am: a5b9b8f452

Change-Id: Iceb0c03fa05a7f6126428128c8e5dced5e7e6cef
 2016-07-09 06:08:40 +00:00
Dan Willemsen
a5b9b8f452 Merge \\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\" am: 5d420e791b 
am: bdd01e86a5

Change-Id: I6205590b79d8325edd5b15e4933a80b2d11238a1
 2016-07-09 06:05:52 +00:00
Erik Kline
74afdf19da Add UIDs for system DNS and tethering DNS am: 3c2e2f4d5e 
am: 48b1eec502

Change-Id: Iacde2a8480ad464ebb16929f41672523badbe8e6
 2016-07-09 06:05:07 +00:00
Dan Willemsen
bdd01e86a5 Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\" 
am: 5d420e791b

Change-Id: I3a65ccc6bc5d6b3c63484baaa6d816939bd48073
 2016-07-09 06:03:09 +00:00
Dan Willemsen
5d420e791b Merge "Use BOARD_USES_VENDORIMAGE to detect vendor image presence" 2016-07-09 05:57:55 +00:00
Erik Kline
48b1eec502 Add UIDs for system DNS and tethering DNS 
am: 3c2e2f4d5e

Change-Id: Ib954d5814acf71aa22463f7f3d055a82e6e30bb4
 2016-07-09 05:43:07 +00:00
Dan Willemsen
0790431f75 Use BOARD_USES_VENDORIMAGE to detect vendor image presence 
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.

Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
 2016-07-08 18:17:48 -07:00
Daniel Rosenberg
91ad8daa9e Merge \"resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp\" into nyc-mr1-dev-plus-aosp 
am: 479c280e58

Change-Id: I4c836744bc9837569c0be6a870b1b668ef2e5472
 2016-07-08 18:33:52 +00:00
Daniel Rosenberg
479c280e58 Merge "resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-07-08 18:24:26 +00:00
Elliott Hughes
a0a31735d1 Merge \\\\"Make klog_fd thread-safe and make klog_init a no-op.\\\\" am: 588b770063 am: 73d363bbc1 am: 7288ac3982 
am: 6605b0b23a

Change-Id: I7d50818201e114fb65db8179c14b754afb069bdb
 2016-07-08 17:17:32 +00:00
Elliott Hughes
6605b0b23a Merge \\\"Make klog_fd thread-safe and make klog_init a no-op.\\\" am: 588b770063 am: 73d363bbc1 
am: 7288ac3982

Change-Id: I46bbcb64eecc01ec7bd8bb502237c1b9057befc4
 2016-07-08 17:12:48 +00:00
Elliott Hughes
7288ac3982 Merge \\"Make klog_fd thread-safe and make klog_init a no-op.\\" am: 588b770063 
am: 73d363bbc1

Change-Id: I48fcc144efb7e6e4de4620bfa5815123247c94d6
 2016-07-08 17:09:08 +00:00
Elliott Hughes
73d363bbc1 Merge \"Make klog_fd thread-safe and make klog_init a no-op.\" 
am: 588b770063

Change-Id: I884276a8f8b8209f6e956c5fb410e8265184e1b5
 2016-07-08 17:05:25 +00:00
Elliott Hughes
588b770063 Merge "Make klog_fd thread-safe and make klog_init a no-op." 2016-07-08 17:01:13 +00:00
Erik Kline
5a30f8828b Merge \\\\"Add UIDs for system DNS and tethering DNS\\\\" am: c4dc4f3fc2 am: fcf3ed51dc am: 9f31416013 
am: 5f7ecd953a

Change-Id: I9c3c4da8626f675d9831a6eb790463e6e382382e
 2016-07-08 08:59:07 +00:00
Erik Kline
5f7ecd953a Merge \\\"Add UIDs for system DNS and tethering DNS\\\" am: c4dc4f3fc2 am: fcf3ed51dc 
am: 9f31416013

Change-Id: I2ad186412133603a36d91801737d15d4441d4956
 2016-07-08 08:55:14 +00:00
Erik Kline
9f31416013 Merge \\"Add UIDs for system DNS and tethering DNS\\" am: c4dc4f3fc2 
am: fcf3ed51dc

Change-Id: Icaeffaa67c3cc5c2452843b92577dd7bdab01146
 2016-07-08 08:51:43 +00:00
Erik Kline
3c2e2f4d5e Add UIDs for system DNS and tethering DNS 
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
(cherry picked from commit d63cf7d85a)
 2016-07-08 17:49:40 +09:00
Erik Kline
fcf3ed51dc Merge \"Add UIDs for system DNS and tethering DNS\" 
am: c4dc4f3fc2

Change-Id: I40d246a3d4c293797ae5204cebd61b50c4021205
 2016-07-08 08:48:11 +00:00
Treehugger Robot
c4dc4f3fc2 Merge "Add UIDs for system DNS and tethering DNS" 2016-07-08 08:43:55 +00:00
Daniel Rosenberg
906c5574b3 resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp 
Change-Id: I64433da7565ad15edb9c572558c4495eeacbf5c7
 2016-07-07 19:40:21 -07:00
TreeHugger Robot
786f5def5b Merge "Switch fastboot to new A/B spec" into nyc-mr1-dev 2016-07-08 00:20:46 +00:00
Daniel Rosenberg
563fcf6f69 Switch fastboot to new A/B spec 
Slots are now referred to as a and b instead
of _a and _b. For the moment, _a and _b will
still be supported. For old devices that
support A/B, they are assumed to have 2 slots.

Bug: 29643845
Change-Id: Ieab6bed7b4977d8386dcec0afa434371f54bd63f
 2016-07-07 15:36:43 -07:00
Tim Murray
10b2ad167a resolve merge conflicts of 3a29e34 to nyc-mr1-dev-plus-aosp 
am: 6469fa2a7e

Change-Id: I36b1580a9ce0548b27059699998289aa34fade7d
 2016-07-07 20:47:56 +00:00
Tim Murray
6469fa2a7e resolve merge conflicts of 3a29e34 to nyc-mr1-dev-plus-aosp 
Change-Id: I4edd53094a98fcb3cd3e1b063122d13f80d36d3c
 2016-07-07 13:40:18 -07:00
Tim Murray
3a29e344b0 Update FIFO settings for new uses of FIFO. 
Adjust FIFO timings as well as allow SurfaceFlinger to use FIFO.

bug 24503801

Change-Id: I2c21d4c1788777c2d0d77227bb872701b35c4ff6
 2016-07-07 11:35:41 -07:00
Mark Salyzyn
589a335a62 Merge \\\\"logcat: help spelling correction\\\\" am: 20a172fca7 am: 59cce987ec am: 4c04c98a31 
am: aa32e374c0

Change-Id: I2618d660f3baef4567d40a092a9f6957edad9eef
 2016-07-06 22:08:54 +00:00
Mark Salyzyn
aa32e374c0 Merge \\\"logcat: help spelling correction\\\" am: 20a172fca7 am: 59cce987ec 
am: 4c04c98a31

Change-Id: I8475be8a4495969aa66826791c9966d7b407f78c
 2016-07-06 21:55:15 +00:00
Mark Salyzyn
4c04c98a31 Merge \\"logcat: help spelling correction\\" am: 20a172fca7 
am: 59cce987ec

Change-Id: I5d1019e7b25601b8ad22b8a2fd728ee64ffd081f
 2016-07-06 21:49:12 +00:00
Mark Salyzyn
59cce987ec Merge \"logcat: help spelling correction\" 
am: 20a172fca7

Change-Id: I2fd638e43b9d4f677d55a9c7b2e7c8eebfce5b0a
 2016-07-06 21:46:29 +00:00
Treehugger Robot
20a172fca7 Merge "logcat: help spelling correction" 2016-07-06 21:36:07 +00:00
Mark Salyzyn
a93ac01709 Merge \\\\"logcat: format verbs and adverbs\\\\" am: 82fb012a03 am: b13d0ce160 am: b6dbe28746 
am: 6a70a53235

Change-Id: I5717a2a299e29ee41ca65306694340003bb4806e
 2016-07-06 20:50:07 +00:00
Mark Salyzyn
6a70a53235 Merge \\\"logcat: format verbs and adverbs\\\" am: 82fb012a03 am: b13d0ce160 
am: b6dbe28746

Change-Id: I277fbcebeeffd237adf63831be715eabfaf8d758
 2016-07-06 20:36:27 +00:00
Mark Salyzyn
e735a7305b logcat: help spelling correction 
threadtime and added clarity for adverbs

Bug: 29916087
Change-Id: Idbed8bc74147c105eaced940d035d0649a244b18
 2016-07-06 13:33:57 -07:00
Mark Salyzyn
b6dbe28746 Merge \\"logcat: format verbs and adverbs\\" am: 82fb012a03 
am: b13d0ce160

Change-Id: I2b6d0772a5e3db4b539db0c4facca583cabe92c1
 2016-07-06 20:32:07 +00:00
Mark Salyzyn
b13d0ce160 Merge \"logcat: format verbs and adverbs\" 
am: 82fb012a03

Change-Id: I1f897abc493f63195fff505c37746ee9e82cfac1
 2016-07-06 20:27:29 +00:00
Treehugger Robot
82fb012a03 Merge "logcat: format verbs and adverbs" 2016-07-06 20:18:00 +00:00
Mark Salyzyn
c26aed8aa3 Merge \\\\"libcutils: canned_fs_config.c drop tabs\\\\" am: 4ee9ed5366 am: ec129fe06c am: a8dbadd54e 
am: 8e958c7aae

Change-Id: If6dd932d20dacde328844c7093e63d112914b93e
 2016-07-06 19:01:35 +00:00
Mark Salyzyn
8e958c7aae Merge \\\"libcutils: canned_fs_config.c drop tabs\\\" am: 4ee9ed5366 am: ec129fe06c 
am: a8dbadd54e

Change-Id: If505b2655e6dbdf863f227ad03838aca66ebd1f6
 2016-07-06 18:59:04 +00:00
Mark Salyzyn
a8dbadd54e Merge \\"libcutils: canned_fs_config.c drop tabs\\" am: 4ee9ed5366 
am: ec129fe06c

Change-Id: I365d06333de78629f36fb94adf035f70a299e291
 2016-07-06 18:56:34 +00:00
Mark Salyzyn
ec129fe06c Merge \"libcutils: canned_fs_config.c drop tabs\" 
am: 4ee9ed5366

Change-Id: Ie72d7562be3316d2ebe732dd1d1fbd4a04b6557b
 2016-07-06 18:54:23 +00:00
Treehugger Robot
4ee9ed5366 Merge "libcutils: canned_fs_config.c drop tabs" 2016-07-06 18:50:22 +00:00
Mark Salyzyn
9cfd1c6ebc logcat: format verbs and adverbs 
Bug: 29916087
Change-Id: I039c95b9dc0aa88f1219121513899934381453ae
 2016-07-06 11:16:07 -07:00
Mark Salyzyn
768cbb0404 libcutils: canned_fs_config.c drop tabs 
- replace tabs with spaces, get indent right
- Sort header order as per Android coding standard

Change-Id: I634f6f716a368ce5565ccc880c51406042f312bf
 2016-07-06 10:45:11 -07:00
Dan Stoza
e96b289115 NativeWindow: Add LAST_[DE]QUEUE_DURATION queries am: 94ededa387 
am: 5d636e830f

Change-Id: I4595768e3cf50364a50b3fc0836114f2cc3bbbee
 2016-07-06 16:30:55 +00:00
Dan Stoza
5d636e830f NativeWindow: Add LAST_[DE]QUEUE_DURATION queries 
am: 94ededa387

Change-Id: I4fb6c849cf97dcd70cc7b7345e230238870e7d3a
 2016-07-06 16:27:37 +00:00
Erik Kline
d63cf7d85a Add UIDs for system DNS and tethering DNS 
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
 2016-07-06 11:13:59 +09:00
Dan Stoza
94ededa387 NativeWindow: Add LAST_[DE]QUEUE_DURATION queries 
Adds two new enums to enable querying the duration of the last
dequeue or queue operations to a Surface/ANativeWindow.

Bug: 29413700
Change-Id: Ifa16755911c4a3c013a7128dd4038d328109c32d
 2016-07-01 16:07:00 -07:00
Daniel Rosenberg
786189def0 Merge \\"Fix missing newline in Fastboot help.\\" into nyc-mr1-dev am: 7f871b4249 
am: 5dbec684ed

Change-Id: Ia8575c440bd0c8dcda7edeaa7904dc12ac6ec94b
 2016-07-01 04:17:48 +00:00