OSDN Git Service
Andreas Gampe [Tue, 6 Sep 2016 22:12:04 +0000 (22:12 +0000)]
Otapreopt: Fix after shared-library work am:
548bdb9308 am:
261480f917
am:
e7c131e250 -s ours
Change-Id: I2155a6d87870175ba7972ae9f4cc26bcbd38f007
Andreas Gampe [Tue, 6 Sep 2016 21:48:36 +0000 (21:48 +0000)]
Otapreopt: Fix after shared-library work am:
548bdb9308
am:
261480f917
Change-Id: Ieafb61f11ac16c3391f88e73d19a3a1a6ebf36f6
Andreas Gampe [Tue, 6 Sep 2016 21:22:44 +0000 (21:22 +0000)]
Otapreopt: Fix after shared-library work
am:
548bdb9308
Change-Id: I1f9d1cbcaa2dfe4508442a1785fe11409a59de32
Andreas Gampe [Fri, 3 Jun 2016 00:56:45 +0000 (17:56 -0700)]
Otapreopt: Fix after shared-library work
Commit
b63d91fd2737680351876406277b6c759f4db33c broke the installd
to otapreopt connection. Fix this. Also refactor a bit to make an
inadvertant break harder.
Bug:
25612095
Change-Id: I8e7b944ecbd5457e4ac4d6ffffdb0468618cf65f
(cherry picked from commit
aef445d1c659698612c0e5a8f3d5f2b9f8a2b778)
Chih-hung Hsieh [Fri, 2 Sep 2016 16:25:31 +0000 (16:25 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger." am:
6fabbc60fc am:
0026ae3b54
am:
ad00fc08e8
Change-Id: I04aea75a139e8d2fd66d814aaf858a92dc6921b9
Chih-hung Hsieh [Fri, 2 Sep 2016 16:22:01 +0000 (16:22 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger." am:
6fabbc60fc
am:
0026ae3b54
Change-Id: I09ba77791c4e5a82dd6bc7e4e07b6b2a5e7ccdff
Chih-hung Hsieh [Fri, 2 Sep 2016 16:18:32 +0000 (16:18 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger."
am:
6fabbc60fc
Change-Id: Ie8d9d087ffdbf804228a3897c07b7ccc9c8b7d7a
Chih-hung Hsieh [Fri, 2 Sep 2016 16:11:33 +0000 (16:11 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger."
Chih-hung Hsieh [Fri, 2 Sep 2016 02:40:42 +0000 (02:40 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan." am:
476e517868 am:
0391054ecd
am:
0fd4771728
Change-Id: Ifadbc478a8e6c4b68c3c687c04bd103e0198f896
Chih-hung Hsieh [Fri, 2 Sep 2016 02:37:42 +0000 (02:37 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan." am:
476e517868
am:
0391054ecd
Change-Id: Ie91da4808c3dc15bb16456ae6288b5fe54c20e93
Chih-hung Hsieh [Fri, 2 Sep 2016 02:33:43 +0000 (02:33 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan."
am:
476e517868
Change-Id: Ide2fd3dd74375a1a7cf32f899d7307b42f805567
Chih-hung Hsieh [Fri, 2 Sep 2016 02:25:41 +0000 (02:25 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan."
Pablo Ceballos [Thu, 1 Sep 2016 20:02:45 +0000 (20:02 +0000)]
Merge "libgui: Add null pointer check in setDisplaySurface" into nyc-mr1-dev am:
669867835b
am:
1d3d791b3c
Change-Id: If2e5e89990859ea583c696a9cd8eaeaee816e45c
Pablo Ceballos [Thu, 1 Sep 2016 20:02:43 +0000 (20:02 +0000)]
libgui: Add null pointer check in setDisplaySurface am:
eddbef88cf
am:
8663a03444
Change-Id: I9ddce6a3f72111aad068bbd13f3618589cbd87fd
Pablo Ceballos [Thu, 1 Sep 2016 19:57:18 +0000 (19:57 +0000)]
Merge "libgui: Add null pointer check in setDisplaySurface" into nyc-mr1-dev
am:
669867835b
Change-Id: Iba59fc196d462f51160f77f85f55c20d45a8d75a
Pablo Ceballos [Thu, 1 Sep 2016 19:57:17 +0000 (19:57 +0000)]
libgui: Add null pointer check in setDisplaySurface
am:
eddbef88cf
Change-Id: I3a3ddac84b3f38f6c911ff65642441fd187bbe54
TreeHugger Robot [Thu, 1 Sep 2016 19:46:30 +0000 (19:46 +0000)]
Merge "libgui: Add null pointer check in setDisplaySurface" into nyc-mr1-dev
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:37:47 +0000 (11:37 -0700)]
Fix google-explicit-constructor warnings in vulkan.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I13c32bd5bc53fe897df58eda331ff70ebcf0b349
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:28:23 +0000 (11:28 -0700)]
Fix google-explicit-constructor warnings in inputflinger.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I8259317db74b177b6e62a0aa2ad21aead47f698e
Pablo Ceballos [Thu, 1 Sep 2016 18:21:21 +0000 (11:21 -0700)]
libgui: Add null pointer check in setDisplaySurface
Bug
31236602
Change-Id: I78d4e28e40db93f7e7e304355b370af0fa790b9d
Eino-Ville Talvala [Tue, 30 Aug 2016 18:13:46 +0000 (18:13 +0000)]
Merge "Surface: Add parcel/unparceling for missing field." into nyc-mr1-dev am:
4a8039121f
am:
f74b920e02
Change-Id: I939347af6ae97769b8f6a58b91a199a9cbdc16e1
Eino-Ville Talvala [Tue, 30 Aug 2016 18:13:46 +0000 (18:13 +0000)]
Surface: Add parcel/unparceling for missing field. am:
529a103fde
am:
aa516aca42
Change-Id: I26bee1ea4d80a2627b8418476fd5adc3aaaef6a4
Eino-Ville Talvala [Tue, 30 Aug 2016 18:05:28 +0000 (18:05 +0000)]
Merge "Surface: Add parcel/unparceling for missing field." into nyc-mr1-dev
am:
4a8039121f
Change-Id: I9a1b1288848ba6fa59af82bd44cf2c12f6f70f20
Eino-Ville Talvala [Tue, 30 Aug 2016 18:05:27 +0000 (18:05 +0000)]
Surface: Add parcel/unparceling for missing field.
am:
529a103fde
Change-Id: I48340f1436279282ba55de0886213021db6608f5
Eino-Ville Talvala [Tue, 30 Aug 2016 17:44:07 +0000 (17:44 +0000)]
Merge "Surface: Add parcel/unparceling for missing field." into nyc-mr1-dev
Eino-Ville Talvala [Tue, 30 Aug 2016 00:33:08 +0000 (17:33 -0700)]
Surface: Add parcel/unparceling for missing field.
Read/write new isSingleBuffered field in native code as well.
Currently just write 'no' unconditionally and discard on read.
Bug:
31162160
Change-Id: Icfb7a37fb37a41f6437fe08bcfad271474ba6983
Dan Willemsen [Tue, 30 Aug 2016 01:30:33 +0000 (01:30 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT" am:
0322a7176f am:
04f46f0347
am:
df34094ace
Change-Id: Ie4a9c094fcfe1956d5b1ba2bd3580cdda9f93908
Dan Willemsen [Tue, 30 Aug 2016 01:24:02 +0000 (01:24 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT" am:
0322a7176f
am:
04f46f0347
Change-Id: I19d40d6877f9831608c9261370a66799e56a5397
Dan Stoza [Tue, 30 Aug 2016 00:17:51 +0000 (00:17 +0000)]
Add requestor name to GraphicBuffer alloc metadata am:
a1d24b45cc -s ours am:
8e0b50b01a
am:
29dccbb427
Change-Id: I902abffa7ebcd58475291afdf20e9176ee4bbc0b
Dan Stoza [Tue, 30 Aug 2016 00:10:28 +0000 (00:10 +0000)]
Add requestor name to GraphicBuffer alloc metadata am:
a1d24b45cc -s ours
am:
8e0b50b01a
Change-Id: Ia02634e20bbb6ab5be7a27857099c6e1792ef601
Dan Stoza [Mon, 29 Aug 2016 23:59:26 +0000 (23:59 +0000)]
Add requestor name to GraphicBuffer alloc metadata
am:
a1d24b45cc -s ours
Change-Id: I2108a173cf5b6df98c1e404ce634b2181ac4a536
Dan Willemsen [Mon, 29 Aug 2016 22:47:25 +0000 (22:47 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT"
am:
0322a7176f
Change-Id: I6cf454e05dc69f1420e4d23593f105005cf0abd5
Treehugger Robot [Mon, 29 Aug 2016 22:36:05 +0000 (22:36 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT"
Pablo Ceballos [Mon, 29 Aug 2016 18:09:50 +0000 (18:09 +0000)]
Merge "Fail setDisplaySurface if can't enable async" into nyc-mr1-dev am:
4db50cec13
am:
62678121c2
Change-Id: I01e6ff77c7bc9ee0bba36d328eaf065b6a07cf35
Pablo Ceballos [Mon, 29 Aug 2016 18:09:43 +0000 (18:09 +0000)]
Fail setDisplaySurface if can't enable async am:
1aad24c0c4
am:
ad685f0f9f
Change-Id: Ia025b013bfc8199cfae3f2463a00df0b81329994
Pablo Ceballos [Mon, 29 Aug 2016 17:59:14 +0000 (17:59 +0000)]
Merge "Fail setDisplaySurface if can't enable async" into nyc-mr1-dev
am:
4db50cec13
Change-Id: I24fc902468e57e81d0e2536eeebf478db302cc63
Pablo Ceballos [Mon, 29 Aug 2016 17:59:14 +0000 (17:59 +0000)]
Fail setDisplaySurface if can't enable async
am:
1aad24c0c4
Change-Id: Ie81fb73d61e9c3a6cbb53d7877e8ebbcc9e5aea5
Pablo Ceballos [Mon, 29 Aug 2016 17:41:57 +0000 (17:41 +0000)]
Merge "Fail setDisplaySurface if can't enable async" into nyc-mr1-dev
Dan Willemsen [Mon, 1 Aug 2016 08:12:35 +0000 (01:12 -0700)]
Remove FRAMEBUFFER_FORCE_FORMAT
It's no longer used, except for a debugging line.
Change-Id: I44e1c17129e71168b263e872e9aaab0f164d3832
Martijn Coenen [Thu, 25 Aug 2016 20:31:38 +0000 (20:31 +0000)]
Merge changes from topic 'utf' am:
213f015932 am:
654107c725
am:
fac1d16e96
Change-Id: I798cd1f965c87d1e5f3c32a47a181623bda36b37
Martijn Coenen [Thu, 25 Aug 2016 20:24:10 +0000 (20:24 +0000)]
Merge changes from topic 'utf' am:
213f015932
am:
654107c725
Change-Id: Ic4c07e7d56f8f78190d7f7e57cad2760b30e90ca
Martijn Coenen [Thu, 25 Aug 2016 20:18:09 +0000 (20:18 +0000)]
Merge changes from topic 'utf'
am:
213f015932
Change-Id: I12341504ac649cf8ea4558ed2ae882e3dcdce7fd
Dan Stoza [Tue, 23 Aug 2016 00:26:41 +0000 (17:26 -0700)]
Add requestor name to GraphicBuffer alloc metadata
Adds a requestor name (usually the BufferQueue consumer's name) to the
metadata that GraphicBufferAllocator stores on allocation so that
`dumpsys SurfaceFlinger` can attempt to attribute buffer usage to the
correct client.
Bug:
30776557
Change-Id: I6e0f346584c871bb3b9d5481f82b697b0475a916
Martijn Coenen [Thu, 25 Aug 2016 20:08:14 +0000 (20:08 +0000)]
Merge changes from topic 'utf'
* changes:
Add bound checks to utf16_to_utf8
Unicode: specify destination length in utf8_to_utf16 methods
Mark Salyzyn [Thu, 25 Aug 2016 19:29:00 +0000 (19:29 +0000)]
Merge "binder: use ashmem_valid()" am:
b5ac868729 am:
d7f671406c
am:
9a057a99df
Change-Id: Ie8676d0d7c2dbc37c44c103e0068e7fbe8661a7a
Mark Salyzyn [Thu, 25 Aug 2016 19:26:00 +0000 (19:26 +0000)]
Merge "binder: use ashmem_valid()" am:
b5ac868729
am:
d7f671406c
Change-Id: I6567609d364e53628e174f3a3c91a6c9edd5ed20
Mark Salyzyn [Thu, 25 Aug 2016 19:23:02 +0000 (19:23 +0000)]
Merge "binder: use ashmem_valid()"
am:
b5ac868729
Change-Id: I51b117612d0db48534bb4e4ecf9307b810088ece
Treehugger Robot [Thu, 25 Aug 2016 19:14:49 +0000 (19:14 +0000)]
Merge "binder: use ashmem_valid()"
Hans Boehm [Thu, 25 Aug 2016 18:52:28 +0000 (18:52 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities" am:
2347fca424 am:
5a558922ca
am:
1f63519780
Change-Id: I25c6956e06f41727b38701ecf024ec7f1f51c57a
Hans Boehm [Thu, 25 Aug 2016 18:48:57 +0000 (18:48 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities" am:
2347fca424
am:
5a558922ca
Change-Id: Ic999217f268bf1482d258c1d4c8e213924081420
Hans Boehm [Thu, 25 Aug 2016 18:45:59 +0000 (18:45 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities"
am:
2347fca424
Change-Id: Icfd7db17ff04ed52b8d669d39a28b42fc0655329
Hans Boehm [Thu, 25 Aug 2016 18:39:01 +0000 (18:39 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities"
Mark Salyzyn [Tue, 23 Aug 2016 23:15:04 +0000 (16:15 -0700)]
binder: use ashmem_valid()
Bug:
30310689
Change-Id: I38e2720843f1eebec39ce6c7d957ee9a1dafac59
Dan Stoza [Thu, 25 Aug 2016 16:59:51 +0000 (16:59 +0000)]
Merge "Add requestor name to GraphicBuffer alloc metadata" into nyc-mr1-dev am:
af671072ca
am:
7e6790c937
Change-Id: Iabc7cc13188f54b9d50f0ea3f33197a0be2ac915
Dan Stoza [Thu, 25 Aug 2016 16:59:51 +0000 (16:59 +0000)]
Add requestor name to GraphicBuffer alloc metadata am:
d4079aff75
am:
a009af9b54
Change-Id: I12f8900605754f5edddc1910ed4b245322f310a2
Dan Stoza [Thu, 25 Aug 2016 16:56:20 +0000 (16:56 +0000)]
Merge "Add requestor name to GraphicBuffer alloc metadata" into nyc-mr1-dev
am:
af671072ca
Change-Id: I6c09c1e7f8e8a4ad2185f808350ab010aca68aa2
Dan Stoza [Thu, 25 Aug 2016 16:56:20 +0000 (16:56 +0000)]
Add requestor name to GraphicBuffer alloc metadata
am:
d4079aff75
Change-Id: I1848ee0b2fc0686a661072e14f042606fd0c209a
Dan Stoza [Thu, 25 Aug 2016 16:48:16 +0000 (16:48 +0000)]
Merge "Add requestor name to GraphicBuffer alloc metadata" into nyc-mr1-dev
Sergio Giro [Tue, 28 Jun 2016 17:19:33 +0000 (18:19 +0100)]
Add bound checks to utf16_to_utf8
Bug:
29250543
Change-Id: I518e7b2fe10aaa3f1c1987586a09b1110aff7e1a
(cherry picked from commit
7e93b2ddcb49b5365fbe1dab134ffb38e6f1c719)
Sergio Giro [Thu, 21 Jul 2016 13:46:35 +0000 (14:46 +0100)]
Unicode: specify destination length in utf8_to_utf16 methods
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
Calvin On [Thu, 25 Aug 2016 05:21:07 +0000 (05:21 +0000)]
Add mangle table in dump_iptables am:
329b90922b
am:
21252c85d5
Change-Id: I67c546f8abd8d87d5a4464d654b88d63a50d548f
Calvin On [Thu, 25 Aug 2016 05:18:06 +0000 (05:18 +0000)]
Add mangle table in dump_iptables
am:
329b90922b
Change-Id: I91942e4662bb11317d0d66cfa9233f0ae5116308
Wei Liu [Thu, 25 Aug 2016 00:11:16 +0000 (00:11 +0000)]
Merge "Revert "Hold a wakelock during dumpstate."" into cw-f-dev
am:
2f7d559195
Change-Id: I1b8d074dbbecb36d88d66cf155c015c5ff4c49d9
Wei Liu [Thu, 25 Aug 2016 00:11:16 +0000 (00:11 +0000)]
Revert "Hold a wakelock during dumpstate."
am:
5cad0ed80d
Change-Id: Ib0084fdd679dc293cdf5bd665ba85d951e7db552
Wei Liu [Thu, 25 Aug 2016 00:02:04 +0000 (00:02 +0000)]
Merge "Revert "Hold a wakelock during dumpstate."" into cw-f-dev
Hans Boehm [Wed, 13 Jul 2016 01:05:49 +0000 (18:05 -0700)]
Fix memory ordering issues; document IMemory peculiarities
Convert to standard atomics.
Correct mHeapId memory ordering. Required acquire ordering on loads
was missing in several places.
Remove atomic updates to count, since it is only updated with lock
held. (And would be missing fences if this were not true.)
Document the peculiar use of copy-in-write vectors in a context in
which copy-on-write is unsafe.
While we're here, consistently check dup() for errors.
Bug:
28816986
Merged-in: I05b9f96e3867fa2e0abe6f319be8c56b89624c41
Change-Id: I05b9f96e3867fa2e0abe6f319be8c56b89624c41
Wei Liu [Wed, 24 Aug 2016 22:08:56 +0000 (22:08 +0000)]
Revert "Hold a wakelock during dumpstate."
This reverts commit
d7803db0e98809e5a17e78885d452479349f339f.
Change-Id: I20066ca30a1b53507099dc62f27c3275781c61ee
Dan Stoza [Tue, 23 Aug 2016 00:26:41 +0000 (17:26 -0700)]
Add requestor name to GraphicBuffer alloc metadata
Adds a requestor name (usually the BufferQueue consumer's name) to the
metadata that GraphicBufferAllocator stores on allocation so that
`dumpsys SurfaceFlinger` can attempt to attribute buffer usage to the
correct client.
Bug:
30776557
Change-Id: I6e0f346584c871bb3b9d5481f82b697b0475a916
Calvin On [Fri, 12 Aug 2016 23:33:12 +0000 (16:33 -0700)]
Add mangle table in dump_iptables
Bug:
30839895
Change-Id: I3f939c74246db96f65e7aa06b60c3b9cf6a02606
Craig Donner [Tue, 23 Aug 2016 18:25:41 +0000 (18:25 +0000)]
Create graphic buffer using binder interfaces am:
686715335a
am:
b43ac2b3b0
Change-Id: I7a49492688d3b55f52ec412da53be964f8433901
Craig Donner [Tue, 23 Aug 2016 16:31:46 +0000 (16:31 +0000)]
Create graphic buffer using binder interfaces
am:
686715335a
Change-Id: I9233639d9d2474fdbb7bcd369b82ae0ed3ee83f3
Craig Donner [Mon, 18 Jul 2016 17:19:54 +0000 (10:19 -0700)]
Create graphic buffer using binder interfaces
Using binder interfaces rather than directly allocating the buffer prevents
SELinux warnings.
Bug:
29402015
Change-Id: I26616dcabf46b5419f0841873faaa6a3ee87ff68
Christopher Wiley [Fri, 19 Aug 2016 23:32:33 +0000 (23:32 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths" am:
b77d368d89 am:
d1b0747e16
am:
e4dbc34f13
Change-Id: I0256a1df425543e201166d2c97f023b52541bf3d
Christopher Wiley [Fri, 19 Aug 2016 23:29:37 +0000 (23:29 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths" am:
b77d368d89
am:
d1b0747e16
Change-Id: I64c88ae56af5055dc0931b5ffaa55149fc53a4bf
Christopher Wiley [Fri, 19 Aug 2016 23:25:59 +0000 (23:25 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"
am:
b77d368d89
Change-Id: Ibc4639f6b1a4067b4c30ca294beb9e747736d3f8
Treehugger Robot [Fri, 19 Aug 2016 23:14:50 +0000 (23:14 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"
Christopher Wiley [Fri, 19 Aug 2016 18:43:54 +0000 (11:43 -0700)]
libbinder: Support reading/writing out T[] lengths
T[] types are special: the length of the out array is written
into the inbound parcel to signal the expected length to the
server.
Bug:
30836680
Change-Id: I4f2f39fd7b1a6b94a25bd7f6c3baed430fd567bc
Test: integration tests pass with this change.
Wei Liu [Fri, 19 Aug 2016 17:14:15 +0000 (17:14 +0000)]
Merge "Hold a wakelock during dumpstate." into cw-f-dev
am:
a2cc07e7ba
Change-Id: I14c44714c8f90d21136a546b32cea0415d67d8b7
Wei Liu [Fri, 19 Aug 2016 17:14:12 +0000 (17:14 +0000)]
Hold a wakelock during dumpstate.
am:
d7803db0e9
Change-Id: I134c8cc5a656bc2d24e58d2dd8a4d200784e1049
Wei Liu [Fri, 19 Aug 2016 17:06:55 +0000 (17:06 +0000)]
Merge "Hold a wakelock during dumpstate." into cw-f-dev
Arve Hjnnevg [Fri, 19 Aug 2016 14:01:50 +0000 (14:01 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3 am:
1f36bcd2ba am:
75469c1fc9 am:
083f4ecca2 am:
b10cd89507 am:
46eee7d103
am:
0d6390b4e1
Change-Id: I10a26606f5f22e3559fdbe5d4945cc8a187ea82d
Arve Hjnnevg [Fri, 19 Aug 2016 13:47:27 +0000 (13:47 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3 am:
1f36bcd2ba am:
75469c1fc9 am:
083f4ecca2 am:
b10cd89507
am:
46eee7d103
Change-Id: Ie304611aec749c44cc455ec1f1ab43e65926334f
Arve Hjnnevg [Fri, 19 Aug 2016 13:22:58 +0000 (13:22 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3 am:
1f36bcd2ba am:
75469c1fc9 am:
083f4ecca2
am:
b10cd89507
Change-Id: I78dd4d0aa005ffa5e88b2dbce5464c771cb3b98f
Arve Hjønnevåg [Fri, 19 Aug 2016 01:30:30 +0000 (01:30 +0000)]
resolve merge conflicts of
083f4ec to nyc-dev-plus-aosp
am:
504fd0a2e9
Change-Id: I7c0bd051ffd81ca419538083dfd3027a1bd716ea
Arve Hjønnevåg [Fri, 19 Aug 2016 01:23:22 +0000 (18:23 -0700)]
resolve merge conflicts of
083f4ec to nyc-dev-plus-aosp
Change-Id: I1532b1e4ee225f821fcd6a9eaee11f20bac8c9e1
Arve Hjnnevg [Fri, 19 Aug 2016 01:21:01 +0000 (01:21 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3 am:
1f36bcd2ba am:
75469c1fc9
am:
083f4ecca2
Change-Id: Ie1931218577e24e4ab0eb7328ccff60a2ca54400
Arve Hjnnevg [Fri, 19 Aug 2016 01:15:05 +0000 (01:15 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3 am:
1f36bcd2ba
am:
75469c1fc9
Change-Id: Icbe1e240a365b6f473ee060cdec384db3b49db24
Arve Hjnnevg [Fri, 19 Aug 2016 01:11:01 +0000 (01:11 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3
am:
1f36bcd2ba
Change-Id: Ic4225509044c66a55910b827e8076cf20c4b5bba
Arve Hjnnevg [Fri, 19 Aug 2016 01:07:30 +0000 (01:07 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025
am:
fa5aafc9f3
Change-Id: I2b83c66f04f7dbfb1740d525ba6d424c9ea42c2b
Arve Hjnnevg [Fri, 19 Aug 2016 01:04:30 +0000 (01:04 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c
am:
2c39ea1025
Change-Id: I355431fb0c566965759cd3d07d481c475cb494d0
Arve Hjnnevg [Fri, 19 Aug 2016 01:01:29 +0000 (01:01 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af
am:
ce0e72911c
Change-Id: I2c36fdb4c92359a03af1c8a563d4d73b9e2898a2
Arve Hjnnevg [Fri, 19 Aug 2016 00:58:34 +0000 (00:58 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac
am:
c29c3734af
Change-Id: I72992d6662bbace5cecce2b96389139c96d2e181
Arve Hjnnevg [Fri, 19 Aug 2016 00:49:29 +0000 (00:49 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7
am:
2cb14836ac
Change-Id: Ia7deecedc7eff4fb35742ba9c7475ca32ecf48aa
Arve Hjnnevg [Fri, 19 Aug 2016 00:46:28 +0000 (00:46 +0000)]
ServiceManager: Allow system services running as secondary users to add services
am:
e6bbe69ba7
Change-Id: Iebb7be5ff42026adb2ff2d2b610902b995acdbc0
Wei Liu [Thu, 18 Aug 2016 18:01:05 +0000 (11:01 -0700)]
Hold a wakelock during dumpstate.
b/
30832947
Change-Id: I9f6f6a9a9cef80aafea5eeb7769f4ac19baba3e5
Arve Hjønnevåg [Thu, 18 Aug 2016 22:42:35 +0000 (15:42 -0700)]
ServiceManager: Allow system services running as secondary users to add services
This should be reverted when all system services have been cleaned up to not
do this. A process looking up a service while running in the background will
see the service registered by the active user (assuming the service is
registered on every user switch), not the service registered by the user that
the process itself belongs to.
BUG:
30795333
Change-Id: I1b74d58be38ed358f43c163692f9e704f8f31dbe
Dmitriy Filchenko [Thu, 18 Aug 2016 03:23:34 +0000 (03:23 +0000)]
Merge "Remove unused include." am:
5242fb42fb am:
23e469f5dc
am:
def5b03a2e
Change-Id: I5dda05a56540ca027158662d679998538c38cbdb
Dmitriy Filchenko [Thu, 18 Aug 2016 03:21:03 +0000 (03:21 +0000)]
Merge "Remove unused include." am:
5242fb42fb
am:
23e469f5dc
Change-Id: I830745f6bcf717089a6264a700ccf8a5e5ab96c0
Dmitriy Filchenko [Thu, 18 Aug 2016 03:17:36 +0000 (03:17 +0000)]
Merge "Remove unused include."
am:
5242fb42fb
Change-Id: Id3ccb5f3dfb9d2188b6e570eaaa6ba23438ae392
Treehugger Robot [Thu, 18 Aug 2016 03:13:47 +0000 (03:13 +0000)]
Merge "Remove unused include."