commit d49da02d968f1ea8f184fb48f631c0707a2800eb
author Neil Fuller <nfuller@google.com> Wed Jan 23 15:10:59 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 23 15:10:59 2019 -0800
tree 7c6bb11ede5fda77bd5bccebf8384c8dad0e624a
parent 47279e630f47ce1e220ceda4da90e94de273d2eb
parent 43aa42e4dd94692cb2fea5415ca7d2e417f943a1

Merge "Delay mediaserver/mediaextractor during boot" am: 855ae44d9f am: 18cb1f5b7f
am: 43aa42e4dd

Change-Id: Ie94b484f16472de217edf38177b98590e0f29487

media/mediaserver/mediaserver.rc

diff --git a/media/mediaserver/mediaserver.rc b/media/mediaserver/mediaserver.rc
index f6c325c..8cfcd79 100644
--- a/media/mediaserver/mediaserver.rc
+++ b/media/mediaserver/mediaserver.rc
@@ -2,5 +2,7 @@
     class main
     user media
     group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm
+    # TODO(b/123275379): Remove updatable when http://aosp/878198 has landed
+    updatable
     ioprio rt 4
     writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks

services/mediaextractor/mediaextractor.rc

diff --git a/services/mediaextractor/mediaextractor.rc b/services/mediaextractor/mediaextractor.rc
index 5fc2941..6b2d0a5 100644
--- a/services/mediaextractor/mediaextractor.rc
+++ b/services/mediaextractor/mediaextractor.rc
@@ -2,5 +2,7 @@
     class main
     user mediaex
     group drmrpc mediadrm
+    # TODO(b/123275379): Remove updatable when http://aosp/878198 has landed
+    updatable
     ioprio rt 4
     writepid /dev/cpuset/foreground/tasks