OSDN Git Service
TreeHugger Robot [Thu, 1 Jun 2017 07:20:54 +0000 (07:20 +0000)]
Merge "AAPT2: XML configuration file parser."
TreeHugger Robot [Thu, 1 Jun 2017 07:14:57 +0000 (07:14 +0000)]
Merge "AAPT2: XML schema and an example configuraiton"
TreeHugger Robot [Thu, 1 Jun 2017 07:07:53 +0000 (07:07 +0000)]
Merge "Temporarily enable HWUI opengl validation"
John Reck [Thu, 1 Jun 2017 06:25:01 +0000 (06:25 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev am:
944b0c73a4
am:
55302e2f4e
Change-Id: Ie4e36cf857fae21261108f2913c10618b8b98d9c
John Reck [Thu, 1 Jun 2017 06:17:58 +0000 (06:17 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev
am:
944b0c73a4
Change-Id: Id9152a19194e1817f83a33b14a6cdccaa84dfeb7
TreeHugger Robot [Thu, 1 Jun 2017 06:11:28 +0000 (06:11 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev
Jack Yu [Thu, 1 Jun 2017 06:00:59 +0000 (06:00 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2 am:
2f74c02826 am:
ce10610a9c
am:
b67a128206 -s ours
Change-Id: I63e6eac2b46aad6999307833b79bf6032a0721fd
Jack Yu [Thu, 1 Jun 2017 05:53:47 +0000 (05:53 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2 am:
2f74c02826
am:
ce10610a9c
Change-Id: I0a068e0eb7e833ad28611cf2be1a8bc18d99830a
Phil Weaver [Thu, 1 Jun 2017 01:19:27 +0000 (01:19 +0000)]
Merge "Initialize list of virtual views before using it."
Phil Weaver [Thu, 1 Jun 2017 01:18:31 +0000 (01:18 +0000)]
Merge "Use correct default value for host view."
Doris Liu [Thu, 1 Jun 2017 01:05:17 +0000 (01:05 +0000)]
Merge "Ensure start delay is properly scaled with duration scale" into oc-dev am:
9057f846ac
am:
4b5d12d25a
Change-Id: I80a1dc2c898a9456b651f6b1375055e6fcb59540
Doris Liu [Thu, 1 Jun 2017 00:57:49 +0000 (00:57 +0000)]
Merge "Ensure start delay is properly scaled with duration scale" into oc-dev
am:
9057f846ac
Change-Id: I124f898f6514a80a0a21682f9f9c21b282e05dde
Doris Liu [Thu, 1 Jun 2017 00:52:57 +0000 (00:52 +0000)]
Merge "Ensure start delay is properly scaled with duration scale" into oc-dev
Shane Farmer [Fri, 12 May 2017 23:22:36 +0000 (16:22 -0700)]
AAPT2: XML configuration file parser.
The XML file is parsed with the aapt::xml::XmlDom parser and actions are
used for the elements we are interested in. This means that there are
cases where a user could add aditional tags/elements to the document
that are technically invalid (acording to the schema) but are ignored by
the parser. This allows us to be more lenient which probably isn't a bad
thing.
Documents have the namespace stripped before processing as the
XmlActionExecutor ignores any elements with a namespace. The namespace
is validated before being removed.
The test cases are all based off the previous example XML file.
Test: Unit tests
Change-Id: I86d7e0dc6347ace3eaa60c1842d59f3cd0d4f749
Chris Craik [Wed, 31 May 2017 23:05:48 +0000 (16:05 -0700)]
Temporarily enable HWUI opengl validation
Bug:
38416992
Test: device boots
Change-Id: I20b7e3546f29c0a0d3e41a7cdafbcc5f4ad387e2
Shane Farmer [Tue, 9 May 2017 22:48:52 +0000 (15:48 -0700)]
AAPT2: XML schema and an example configuraiton
The current iteration of the schema allows for both Split and Optimize
commands running off the same file. A split command is multiple optimize
command, and an optimize is a split with only a single artifact. To
combine the two, a single file with one or more artifacts can be passed
to either command. If multiple artifiacts are used for an optimize
command, the required artifact can be specified on the command line. A
configuration with only a single artifact can be used with either
command to get the same result.
Change-Id: Ie48eda6e2f9f8bf25d75ef7bcc3b3401a2d3e8eb
Bugs:
37847908
Test: xmllint --noout --schema aapt2.xsd example/config.xml
Adam Lesinski [Wed, 31 May 2017 22:48:10 +0000 (22:48 +0000)]
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev am:
ceb24e88cb
am:
1b7ec9ad2c
Change-Id: Ic7f152784761283d413278313a968fd68dd3c76b
Peter Qiu [Wed, 31 May 2017 22:42:10 +0000 (22:42 +0000)]
Merge "hotspot2: add/update javadoc for Passpoint APIs" into oc-dev am:
8837aff18b
am:
c3e58eb3f2
Change-Id: Icf572f5b5b224a78762fd728ab90778d84c9ecbc
Adam Lesinski [Wed, 31 May 2017 22:42:08 +0000 (22:42 +0000)]
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
am:
ceb24e88cb
Change-Id: I7e42ea6c56007f6f52fa237eb58adcdb1f5a6800
Adam Lesinski [Wed, 31 May 2017 22:36:55 +0000 (22:36 +0000)]
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
Peter Qiu [Wed, 31 May 2017 22:35:11 +0000 (22:35 +0000)]
Merge "hotspot2: add/update javadoc for Passpoint APIs" into oc-dev
am:
8837aff18b
Change-Id: I1659c6bd9ac5f5420eae1ffded9c0d257e8436c6
TreeHugger Robot [Wed, 31 May 2017 22:28:59 +0000 (22:28 +0000)]
Merge "hotspot2: add/update javadoc for Passpoint APIs" into oc-dev
Bryce Lee [Wed, 31 May 2017 22:07:09 +0000 (22:07 +0000)]
Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev am:
646038a3c3
am:
9ad251e43b
Change-Id: Iaddbb28b25642c6128bc8f0705b8f241b42e2071
Bryce Lee [Wed, 31 May 2017 21:58:03 +0000 (21:58 +0000)]
Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev
am:
646038a3c3
Change-Id: I9f6b1b84261d39d2db578011b78c52a516b54bab
Jack Yu [Wed, 31 May 2017 21:52:05 +0000 (21:52 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2
am:
2f74c02826
Change-Id: Ia81f03a076901d545972fc3cbe7a18d20ea6df2a
Bryce Lee [Wed, 31 May 2017 21:46:15 +0000 (21:46 +0000)]
Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev
Jack Yu [Wed, 31 May 2017 21:44:13 +0000 (21:44 +0000)]
Merge "Added video calling data usage per-uid support"
am:
36fdb346f2
Change-Id: I3901efbfafcfab7e076b669f0313dce860e97072
TreeHugger Robot [Wed, 31 May 2017 21:40:41 +0000 (21:40 +0000)]
Merge "Add strings for Wifi Speed Labeling."
Treehugger Robot [Wed, 31 May 2017 21:33:55 +0000 (21:33 +0000)]
Merge "Added video calling data usage per-uid support"
TreeHugger Robot [Wed, 31 May 2017 21:31:34 +0000 (21:31 +0000)]
Merge changes from topic 'master_hw_bitmaps'
* changes:
Updating AnimationSpec and related internal APIs to use GraphicBuffer.
Update code to draw into hardware bitmaps.
Hyunyoung Song [Wed, 31 May 2017 21:28:11 +0000 (21:28 +0000)]
Merge "Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto" into oc-dev am:
7db56af8f9
am:
5288d90af8
Change-Id: I3e9c8ea4f0a5390dd2b8541493d357ad67dee21b
Adam Lesinski [Wed, 31 May 2017 21:26:17 +0000 (21:26 +0000)]
Merge "AAPT2: Update --no-version-vector list" into oc-dev am:
f296105e22
am:
ad227a8086
Change-Id: Ie60160136d6bbca607ce98cd675ffed984b2debc
Adam Lesinski [Wed, 31 May 2017 21:23:46 +0000 (21:23 +0000)]
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev am:
f42c86660d
am:
b5cdbdfcf8
Change-Id: Ifabd2f220f96f9dc4942c2cc65b24da6f2d90b13
Bryce Lee [Wed, 31 May 2017 21:22:33 +0000 (21:22 +0000)]
Revert "Handle not having main window in createThumbnailAppAnimator."
This reverts commit
6db4d15d726b8830ad56766352a79fe0417cb9c2.
Bug:
62096254
Reason for revert: Breaking the build due to test references to class
Change-Id: I6021c802d04a3a55a19f54fc94389957c8152ed9
Hyunyoung Song [Wed, 31 May 2017 21:17:47 +0000 (21:17 +0000)]
Merge "Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto" into oc-dev
am:
7db56af8f9
Change-Id: Idab3ef3f74f494a3d852f047088e621b4cc01fc5
Adam Lesinski [Wed, 31 May 2017 21:15:32 +0000 (21:15 +0000)]
Merge "AAPT2: Update --no-version-vector list" into oc-dev
am:
f296105e22
Change-Id: I0cde63dfd73b50debdc56f549f7adb1318f05309
Felipe Leme [Wed, 31 May 2017 21:14:08 +0000 (21:14 +0000)]
Merge "Don't automatically autofill when manual request returned just 1 dataset." into oc-dev am:
d8d9758363
am:
4e26aa3622
Change-Id: I5697f766a83a3a3d4092f66df58e3a2ed0958435
Adam Lesinski [Wed, 31 May 2017 21:12:58 +0000 (21:12 +0000)]
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
am:
f42c86660d
Change-Id: I4a52a16fff3d544d8d7d63d8a482ba7e2111d01a
Tor Norbye [Wed, 31 May 2017 21:10:17 +0000 (21:10 +0000)]
Merge "
37135323: Add FLAG_IMMUTABLE to @PendingIntent.Flags"
TreeHugger Robot [Wed, 31 May 2017 21:07:03 +0000 (21:07 +0000)]
Merge "Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto" into oc-dev
Felipe Leme [Wed, 31 May 2017 21:03:39 +0000 (21:03 +0000)]
Merge "Don't automatically autofill when manual request returned just 1 dataset." into oc-dev
am:
d8d9758363
Change-Id: I5e4e5effcfc58eaef9df1a29f23dce4ac553ad1e
John Reck [Wed, 31 May 2017 21:02:50 +0000 (14:02 -0700)]
Fix dequeus outside of frame drawing
Bug:
62213889
Test: Repro steps in bug
Change-Id: I8fc407b280ba82c669fc2bb03750cab139adb965
Bryce Lee [Wed, 31 May 2017 21:01:44 +0000 (21:01 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev am:
fd5129b978
am:
44ad670940
Change-Id: I06eb638d76a1223237d7308618c9ad715467519a
Bryce Lee [Wed, 31 May 2017 20:52:17 +0000 (20:52 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev
am:
fd5129b978
Change-Id: Ic9e346ee1b246a96132b4492423216a54ce92b0b
TreeHugger Robot [Wed, 31 May 2017 20:50:23 +0000 (20:50 +0000)]
Merge "Revert "Create new Audio include for TVs that doesn't have ringtones.""
TreeHugger Robot [Wed, 31 May 2017 20:48:49 +0000 (20:48 +0000)]
Merge "AAPT2: Update --no-version-vector list" into oc-dev
Adam Lesinski [Wed, 31 May 2017 20:48:00 +0000 (20:48 +0000)]
Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 20:43:14 +0000 (20:43 +0000)]
Merge "Don't automatically autofill when manual request returned just 1 dataset." into oc-dev
Bryce Lee [Wed, 31 May 2017 20:39:29 +0000 (20:39 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev
Matthew Ng [Wed, 31 May 2017 20:36:39 +0000 (20:36 +0000)]
Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev am:
39e8819755
am:
82db73bbc8
Change-Id: I65aff25a85b36a7c00dd778eb3f141530a86da90
Adrian Roos [Wed, 31 May 2017 20:34:18 +0000 (20:34 +0000)]
Merge "AOD: Scale icon padding with the drawing size" into oc-dev am:
59e16c9eb9
am:
baf5dcb29d
Change-Id: I802470aeca3a9e124b724c04ace4eee35833b0e6
Julia Reynolds [Wed, 31 May 2017 20:26:38 +0000 (20:26 +0000)]
Merge "Change default for group alert behavior" into oc-dev am:
faba1835b4
am:
dfd7810288
Change-Id: I8808afb221d2ae18424d9d37c522957b34dd99a6
Julia Reynolds [Wed, 31 May 2017 20:22:50 +0000 (20:22 +0000)]
Merge "Don't verify secondary setting on restore" into oc-dev am:
25329fa14f
am:
50aff0167d
Change-Id: I3b5a5742bd13a3884e2f7b66e2742e2d70102128
Matthew Ng [Wed, 31 May 2017 20:17:55 +0000 (20:17 +0000)]
Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev
am:
39e8819755
Change-Id: If5f5953b95e27a809b50f7baac8a9a9ab99b1a14
Peter Qiu [Wed, 3 May 2017 17:23:22 +0000 (10:23 -0700)]
hotspot2: add/update javadoc for Passpoint APIs
Add javadoc for getter/setter methods configuration classes.
Document exceptions with @throws tag.
Bug:
37907515
Test: build
Change-Id: Ied1842912f6710530bf77db4df5ef5d30a44b2a7
Adrian Roos [Wed, 31 May 2017 20:13:54 +0000 (20:13 +0000)]
Merge "AOD: Scale icon padding with the drawing size" into oc-dev
am:
59e16c9eb9
Change-Id: Ie32c3107026409693d4fa11cab2047e00362c2b6
TreeHugger Robot [Wed, 31 May 2017 20:12:56 +0000 (20:12 +0000)]
Merge "Fix bug where scrim would be transparent"
Android Build Merger (Role) [Wed, 31 May 2017 20:11:24 +0000 (20:11 +0000)]
Merge changes from topic 'am-
a47d2b51b72a4b9da02be5683a2ecaae'
* changes:
Merge "Track Partial wakelock time in background" into oc-dev am:
1dfd194f7d am:
b5ba4b1fd2
Merge "Fix batterystat Counter misreporting when charging" into oc-dev am:
413b135244 am:
95d00a9a25
Merge "Batterystats track background bad ble scan time" into oc-dev am:
fe06de1fc2 am:
41e3f1479c
TreeHugger Robot [Wed, 31 May 2017 20:09:50 +0000 (20:09 +0000)]
Merge "Switch to using plural strings for hours and minutes in the snooze menu"
Julia Reynolds [Wed, 31 May 2017 20:06:12 +0000 (20:06 +0000)]
Merge "Change default for group alert behavior" into oc-dev
am:
faba1835b4
Change-Id: I622151274ad3d119e7c35ee00b9d3baa1d2efa45
Joe Onorato [Wed, 31 May 2017 20:05:37 +0000 (20:05 +0000)]
Merge "Track Partial wakelock time in background" into oc-dev am:
1dfd194f7d
am:
b5ba4b1fd2
Change-Id: I72c27aeae5061102d725ba52fb72a0489117649d
Joe Onorato [Wed, 31 May 2017 20:04:31 +0000 (20:04 +0000)]
Merge "Fix batterystat Counter misreporting when charging" into oc-dev am:
413b135244
am:
95d00a9a25
Change-Id: Ifaa4e1d37c4ad8d841e9224295bb66b000ee0cf2
Julia Reynolds [Wed, 31 May 2017 20:02:09 +0000 (20:02 +0000)]
Merge "Don't verify secondary setting on restore" into oc-dev
am:
25329fa14f
Change-Id: I674c7da780afba0974e4ffe3f53d31bca665fdf0
Joe Onorato [Wed, 31 May 2017 20:01:34 +0000 (20:01 +0000)]
Merge "Batterystats track background bad ble scan time" into oc-dev am:
fe06de1fc2
am:
41e3f1479c
Change-Id: I3e9425e32d72b7415e776076cb977716073eb921
TreeHugger Robot [Wed, 31 May 2017 19:53:10 +0000 (19:53 +0000)]
Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev
Joe Onorato [Wed, 31 May 2017 19:49:49 +0000 (19:49 +0000)]
Merge "Track Partial wakelock time in background" into oc-dev
am:
1dfd194f7d
Change-Id: I06af34e0cf444fd7f26add4e6b54bcb0d7f4d617
Joe Onorato [Wed, 31 May 2017 19:47:16 +0000 (19:47 +0000)]
Merge "Fix batterystat Counter misreporting when charging" into oc-dev
am:
413b135244
Change-Id: I022ebf39e2dc8ac77466ffe23306f9f38914659d
Joe Onorato [Wed, 31 May 2017 19:46:11 +0000 (19:46 +0000)]
Merge "Batterystats track background bad ble scan time" into oc-dev
am:
fe06de1fc2
Change-Id: Ibca369ace041435ce1f9a9997658b86fd4b5f087
TreeHugger Robot [Wed, 31 May 2017 19:44:56 +0000 (19:44 +0000)]
Merge "AOD: Scale icon padding with the drawing size" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 19:43:00 +0000 (19:43 +0000)]
Merge "Change default for group alert behavior" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 19:40:38 +0000 (19:40 +0000)]
Merge "Don't verify secondary setting on restore" into oc-dev
Jack Yu [Fri, 26 May 2017 23:08:22 +0000 (16:08 -0700)]
Added video calling data usage per-uid support
Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.
Test: Manual
bug:
37671326
Merged-In: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Change-Id: I8351e9ae17c84210f7ca6c319d3bddcbb0043341
Felipe Leme [Wed, 31 May 2017 19:36:57 +0000 (19:36 +0000)]
Merge "Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev am:
09f7dd5780" into oc-dev-plus-aosp
am:
12ae0a9c63
Change-Id: I97147c231083e2cafb3f7f1feb84a48dbf9a8d12
Felipe Leme [Wed, 31 May 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev am:
09f7dd5780
am:
6c643da78a
Change-Id: I6edc52fd207458b31cee47603fcfacf4460f9990
Felipe Leme [Wed, 31 May 2017 19:29:38 +0000 (19:29 +0000)]
Merge "Always post AutofillManager operations in the UI thread." into oc-dev am:
21999d2895
am:
614e88711a
Change-Id: Iba0f1aa39aa6d3781796231ad32e200be4557163
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Track Partial wakelock time in background" into oc-dev
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Fix batterystat Counter misreporting when charging" into oc-dev
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Batterystats track background bad ble scan time" into oc-dev
Winson Chung [Wed, 31 May 2017 19:24:36 +0000 (19:24 +0000)]
Merge changes from topic 'hw_bitmap' into oc-dev am:
4e73123c52
am:
b3419d76a6 -s ours
Change-Id: I42136064a8ef7339fdb3c2b0bd18fc6693219d09
TreeHugger Robot [Wed, 31 May 2017 19:15:27 +0000 (19:15 +0000)]
Merge "Refactor bootanimation into a shared lib."
Android Build Merger (Role) [Wed, 31 May 2017 19:07:21 +0000 (19:07 +0000)]
Merge "Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev am:
09f7dd5780" into oc-dev-plus-aosp
Felipe Leme [Wed, 31 May 2017 19:05:20 +0000 (19:05 +0000)]
Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev
am:
09f7dd5780
Change-Id: I40f0601e49f95ae7bd194431520a9ab0b8bfc488
Felipe Leme [Wed, 31 May 2017 19:01:15 +0000 (19:01 +0000)]
Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev
am:
09f7dd5780
Change-Id: I0cb4095dd6d7c05615db4312fceb412c481b0420
Felipe Leme [Wed, 31 May 2017 18:59:10 +0000 (18:59 +0000)]
Merge "Always post AutofillManager operations in the UI thread." into oc-dev
am:
21999d2895
Change-Id: Ieee6a19f7cabc65b973d09e7d73a8562c2a9ea6a
Winson Chung [Wed, 31 May 2017 18:56:50 +0000 (18:56 +0000)]
Merge changes from topic 'hw_bitmap' into oc-dev
am:
4e73123c52
Change-Id: Ic202387c7fddcf6cc87024812c112e5ce3a4ab7b
Adam Lesinski [Fri, 26 May 2017 18:50:40 +0000 (11:50 -0700)]
BatteryStats: Acquire network stats without BatteryStatsImpl lock
Moves the network stats collection under a different lock to
prevent the main BatteryStatsImpl lock from being held while doing I/O.
Bug:
37645919
Bug:
38296815
Test: manual
Change-Id: I0d6b4a7b12b234939cb6eb3a32658b28f61dff4f
Bill Yi [Wed, 31 May 2017 18:52:37 +0000 (18:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
42f81ee464 -s ours
am:
8051830544 -s ours
Change-Id: Ib3f4055bd160c3860b922cc446a1e00ca9cc03f8
TreeHugger Robot [Wed, 31 May 2017 18:50:55 +0000 (18:50 +0000)]
Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev
Bill Yi [Wed, 31 May 2017 18:50:16 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
8748505b32 -s ours
am:
feb24b20d0 -s ours
Change-Id: I05a74ab6c25c17862c5b533b74682dd09ebae4b3
TreeHugger Robot [Wed, 31 May 2017 18:49:33 +0000 (18:49 +0000)]
Merge "Always post AutofillManager operations in the UI thread." into oc-dev
Winson Chung [Wed, 31 May 2017 18:46:53 +0000 (18:46 +0000)]
Merge changes from topic 'hw_bitmap' into oc-dev
* changes:
DO NOT MERGE Updating AnimationSpec and related internal APIs to use GraphicBuffer.
Update code to draw into hardware bitmaps.
Daniel Cardenas [Wed, 31 May 2017 18:35:06 +0000 (18:35 +0000)]
Revert "Create new Audio include for TVs that doesn't have ringtones."
There is currently 37 megabytes free. Ringtones take about 3 megabytes.
Future assistant may add call in, in future.
Bug:
36066803
Test: build
This reverts commit
8ac32ec6580c11a853862ebabd20f3cacb8e6cf7.
Change-Id: I44a2fabb613f46fa7834eced42bcb90c21948cff
Hyunyoung Song [Wed, 24 May 2017 23:48:41 +0000 (16:48 -0700)]
Do not add unnecessary prefix to dumpsys activity provider [NAME] --proto
Bug:
36904684
Test: builds, and tests succeed in the same topic branch
The test executes following
"dumpsys activity provider [launcher package name]/[provider name that implements workspace dump logging]
--proto"
In order to extract the proto binary from this stream, there cannot
be extra prefix added to each line. Hence, when "--proto" flag
is on, simply call the sub provider record's dump method.
This is following same pattern on other system service dump.
Having --proto flag also doesn't do any pretty printing.
e.g., dumpsys appwidget --proto.
Change-Id: I13712a45ce5b584123b3bd73c023df349fb86809
Jorim Jaggi [Wed, 31 May 2017 18:35:51 +0000 (18:35 +0000)]
Merge "Check for null owner info" into oc-dev am:
f220d95f54
am:
d73edd5c0e
Change-Id: Ia4398204190408411d56c564151ca9aafbbc8a25
Mady Mellor [Thu, 11 May 2017 00:16:28 +0000 (17:16 -0700)]
Switch to using plural strings for hours and minutes in the snooze menu
Test: Manual - show the snooze menu, expand to see options
Bug:
38207398
Change-Id: I081464b2205d4241af02f71d2fec0286020fc6d8
Bill Yi [Wed, 31 May 2017 18:30:00 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
42f81ee464 -s ours
Change-Id: I6aef4a656ed7bb29f04921dc5fc25ad5530c7ff7
Bill Yi [Wed, 31 May 2017 18:27:54 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
8748505b32 -s ours
Change-Id: I9efc01a30981af94061ea906727a72779e052c14
Jorim Jaggi [Wed, 31 May 2017 18:23:20 +0000 (18:23 +0000)]
Merge "Check for null owner info" into oc-dev
am:
f220d95f54
Change-Id: I69e55b862242a42054c87477cbbc2723fa1e76a4
TreeHugger Robot [Wed, 31 May 2017 18:22:52 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 18:17:42 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
OSDN Git Service
