OSDN Git Service
Jean-Michel Trivi [Mon, 24 Apr 2017 23:50:25 +0000 (23:50 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev am:
9e55fcbdc2
am:
c2c0008c68
Change-Id: I4b35c08e151401ebabf7740f706b79d7911838f8
Jean-Michel Trivi [Mon, 24 Apr 2017 23:44:22 +0000 (23:44 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
am:
9e55fcbdc2
Change-Id: Id7a2620c784e6bc2bee287d0ef3836f890f227b8
Jean-Michel Trivi [Mon, 24 Apr 2017 23:39:41 +0000 (23:39 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
Adam Lesinski [Mon, 24 Apr 2017 23:37:13 +0000 (23:37 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev am:
76831f7e39
am:
085abab5ba
Change-Id: Ic5e4a29f2b81aac05cf53b99190e92989163e412
Felipe Leme [Mon, 24 Apr 2017 23:32:33 +0000 (23:32 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev am:
0fe852080e
am:
8ecd9c47f7 -s ours
Change-Id: Ie286abe6634ad32bb7806a312630cf1f40b5d9c6
Adam Lesinski [Mon, 24 Apr 2017 23:31:26 +0000 (23:31 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
am:
76831f7e39
Change-Id: Ia2a30b7b9f4f11afdbf3ee020288a8d29245a4f4
TreeHugger Robot [Mon, 24 Apr 2017 23:31:06 +0000 (23:31 +0000)]
Merge "Don't skip intents where config changed."
TreeHugger Robot [Mon, 24 Apr 2017 23:26:01 +0000 (23:26 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
* changes:
AAPT2: Allow truncating of package names
AAPT2: Make BinaryResourceParser more lenient
Etan Cohen [Mon, 24 Apr 2017 23:25:06 +0000 (23:25 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev am:
2be0a532bf
am:
1945f3ad2e
Change-Id: I94ddbb5eae5ff644b5b06b57633762b6bce8433f
Felipe Leme [Mon, 24 Apr 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
am:
0fe852080e
Change-Id: Ic755dc978f745de36018af56a6ad851f138d98b0
Ruben Brunk [Mon, 24 Apr 2017 23:15:02 +0000 (23:15 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev am:
d8f13bbc3d
am:
80e2f403d2
Change-Id: I848538c372bdb95ec4e13babe4dc1da7ac455ce9
Felipe Leme [Mon, 24 Apr 2017 23:10:48 +0000 (23:10 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
Chien-Yu Chen [Mon, 24 Apr 2017 23:10:38 +0000 (23:10 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev am:
06d84c3a86
am:
2fd83ae977
Change-Id: Ieca16e7ab8d09e92b3d37537f3b5a28bbe2f2947
Etan Cohen [Mon, 24 Apr 2017 23:07:42 +0000 (23:07 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev
am:
2be0a532bf
Change-Id: I0d2292b7d7fe932657e17598e2899b36971186a9
Felipe Leme [Fri, 21 Apr 2017 15:56:04 +0000 (08:56 -0700)]
Minor fixes on Autofill Framework:
- Removed default implementation of onProvideAutofillVirtualStructure() that
was using accessibility API (it's useless because without the View calling
AutofillManager.notifyViewEntered(), it would never be triggered).
- Fixed obsolete TODOs.
- Removed obsolete service class name constant.
- Removed unused debug constant.
Fixes:
37078783
Fixes:
33197203
Bug:
33802548
Bug:
35956626
Test: CtsAutoFillServiceTestCases pass
Merged-In: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Change-Id: I834d34b8af8bf0d781dc7e0ffcd6e600bfa2d183
Etan Cohen [Mon, 24 Apr 2017 22:59:17 +0000 (22:59 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev
Ruben Brunk [Mon, 24 Apr 2017 22:53:53 +0000 (22:53 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
am:
d8f13bbc3d
Change-Id: I30baa3eeaab4d8cdb189ab4d59c3272c6232f798
Ruben Brunk [Mon, 24 Apr 2017 22:49:07 +0000 (22:49 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev
Jeff Sharkey [Mon, 24 Apr 2017 22:48:57 +0000 (22:48 +0000)]
Merge "Bunch of new API lint rules." into oc-dev am:
57b999605c
am:
8ec71a639b
Change-Id: Iee0b9508f3eb79eb88e1748a323390283efb9494
Wale Ogunwale [Mon, 24 Apr 2017 22:47:16 +0000 (22:47 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev am:
3fc176913a
am:
f8b513e652
Change-Id: I2c88524eb8d8ef0dfbc54e586b3b770923444eca
Karthik Ravi Shankar [Mon, 24 Apr 2017 22:45:33 +0000 (22:45 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev am:
13ba34bf37
am:
875c8445a8
Change-Id: I12f88b60d82fba4227c9f565009e6c3e42f6798c
Jeff Sharkey [Mon, 24 Apr 2017 22:43:34 +0000 (22:43 +0000)]
Merge "Even more auto-doc work." into oc-dev am:
880f4f4cc2
am:
9652eef0b2
Change-Id: I96c77c62b6ee3b5acaa45e116d35c7114797a0b8
Chien-Yu Chen [Mon, 24 Apr 2017 22:41:49 +0000 (22:41 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
am:
06d84c3a86
Change-Id: I49afc64341f4bb53287991a48535ad2108afce3f
TreeHugger Robot [Mon, 24 Apr 2017 22:36:50 +0000 (22:36 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
Kang Li [Mon, 24 Apr 2017 22:32:18 +0000 (22:32 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev am:
925d3cf211
am:
1a297e53dc
Change-Id: Ie44cd313255d95e583657829448fd83decfaa10b
Julia Reynolds [Mon, 24 Apr 2017 22:25:36 +0000 (22:25 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev am:
10e7275965
am:
521f6b46f2
Change-Id: Idcec9055f4d75e40d37b29c5bca90720995e84e1
Jeff Sharkey [Mon, 24 Apr 2017 22:25:17 +0000 (22:25 +0000)]
Merge "Bunch of new API lint rules." into oc-dev
am:
57b999605c
Change-Id: I0047174a7cfd43f644d2010f9f0c6662440f4680
Julia Reynolds [Mon, 24 Apr 2017 22:23:49 +0000 (22:23 +0000)]
Merge "Don't consider uri empty a valid sound" into oc-dev am:
db5f5c3a17
am:
b61659e291
Change-Id: I6122c2d43e3bf5eb0f8b1fb6c0620cb2b4a6abd9
Santos Cordon [Mon, 24 Apr 2017 22:22:07 +0000 (22:22 +0000)]
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev am:
5d1c65971f
am:
291b09ec4b
Change-Id: I64d42562ede23eb6436719dfce527430ff9451b3
Jeff Sharkey [Mon, 24 Apr 2017 22:18:51 +0000 (22:18 +0000)]
Merge "Bunch of new API lint rules." into oc-dev
Felipe Leme [Mon, 24 Apr 2017 22:17:35 +0000 (22:17 +0000)]
Merge "Replaced getUrl() by getWebDomain()." into oc-dev am:
ffef2ad2b0
am:
bf4451aa0e
Change-Id: I96fae5dae4a5b5a03d39170ad04b1d812f991668
Eugene Susla [Mon, 24 Apr 2017 22:14:18 +0000 (22:14 +0000)]
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev am:
e4964118c6
am:
6417845d9f
Change-Id: I9e1b119efdeab25932d81a749cfaa8d0b67478c4
Amith Yamasani [Mon, 24 Apr 2017 22:12:41 +0000 (22:12 +0000)]
Merge "Add link to class with constants" into oc-dev am:
6c0f8dc0b0
am:
515239fa6f
Change-Id: Id0fde28e92f8ab92f09e5d0284e9a2f37f838d55
Robert Carr [Mon, 24 Apr 2017 22:10:47 +0000 (22:10 +0000)]
Merge "Prevent leak of AppWindowTokens." into oc-dev am:
53845068f4
am:
657dcd0202
Change-Id: I28234916bd01d2d146c26339644de57b085459d3
Pankaj Kanwar [Mon, 24 Apr 2017 22:06:48 +0000 (22:06 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
f02b7b7ba6 am:
4ef0e826c4 am:
b12a7c8058 -s ours
am:
0d5c062d97 -s ours
Change-Id: I661c22713cee99138f91053b52a466684a5580cb
Amith Yamasani [Mon, 24 Apr 2017 22:04:46 +0000 (22:04 +0000)]
Merge "Check bluetooth app id instead of uid" into oc-dev am:
094996a2b3
am:
3a3fdfa53b
Change-Id: I2ab94eb4697ac47b34468f961399a413aac4ef58
Glen Kuhne [Mon, 24 Apr 2017 22:00:03 +0000 (22:00 +0000)]
Merge "Wifi Metrics STA event list" into oc-dev am:
9870d0bef7
am:
19bdb91fb7
Change-Id: Ice4284ca5c947b738a4c1d5452e6e7e9502aecd1
Pankaj Kanwar [Mon, 24 Apr 2017 21:58:03 +0000 (21:58 +0000)]
Merge "Update USSD API docs per API review comments." into oc-dev am:
c2d54af521
am:
5e4296bad9
Change-Id: Ic49859ee3f3469f722354aa17920bc51cd524ae9
Yang Ni [Mon, 24 Apr 2017 21:53:37 +0000 (21:53 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" into oc-dev am:
4d23f258d4
am:
c6606b843a
Change-Id: I41250fd7944c96966cbcad30dd23d61c517a5a2d
Wale Ogunwale [Mon, 24 Apr 2017 21:51:51 +0000 (21:51 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev
am:
3fc176913a
Change-Id: Ibcc4ecf80bd9dd10d8f09147a624f095ceb48717
Brad Ebinger [Mon, 24 Apr 2017 21:51:27 +0000 (21:51 +0000)]
Merge "Whitelist PHONE_STATE to wakeup apps" into oc-dev am:
41bf42a1c7
am:
0109e15888
Change-Id: I1bb9350302f759044847493f8e8805af84f18043
Geoffrey Pitsch [Mon, 24 Apr 2017 21:49:39 +0000 (21:49 +0000)]
Merge "Hide secondary text for Default channel if not blocked" into oc-dev am:
9226516cef
am:
7561c3fb53
Change-Id: I0c820c855e1e9718b6c77ac92dbb5efc477c6e78
Jakub Pawlowski [Mon, 24 Apr 2017 21:47:56 +0000 (21:47 +0000)]
Merge "Merge "Get rid of the IAdvertiserCallabck" am:
7503b11b14 am:
2fb02a252c am:
526719a1a2" into oc-dev-plus-aosp
am:
28a9a1a61e
Change-Id: I1b3a962d28ff95aaf147afb0032ab7bc6495611b
TreeHugger Robot [Mon, 24 Apr 2017 21:46:28 +0000 (21:46 +0000)]
Merge "Fixed transition animation from pipable activities" into oc-dev
Jerry Zhang [Thu, 20 Apr 2017 20:46:29 +0000 (13:46 -0700)]
Don't skip intents where config changed.
Since we are adding ffs.mtp.ready to the init
scripts, we can no longer skip intents that cause
that property to be set.
This fixes the case where device is disconnected
and adb is repeatedly enabled/disabled.
Test: enable/disable adb, usb mtp
Bug:
33220530
Change-Id: I48e687c1af3f9da9e522ebe879285877c0168da8
Karthik Ravi Shankar [Mon, 24 Apr 2017 21:39:45 +0000 (21:39 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev
am:
13ba34bf37
Change-Id: Id0195114803007719ff2dab6e8b1ef18983c95ad
Jeff Sharkey [Mon, 24 Apr 2017 21:38:03 +0000 (21:38 +0000)]
Merge "Even more auto-doc work." into oc-dev
am:
880f4f4cc2
Change-Id: I78199f8366fbda65a4b4917675291d946e29285c
Android Build Merger (Role) [Mon, 24 Apr 2017 21:36:35 +0000 (21:36 +0000)]
Merge "Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am:
8a4ff5edb5" into oc-dev-plus-aosp am:
97cb726b08"
George Mount [Mon, 24 Apr 2017 21:34:45 +0000 (21:34 +0000)]
Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am:
8a4ff5edb5" into oc-dev-plus-aosp
am:
97cb726b08
Change-Id: Icbba1b2089b89351f93e8d0c3b7e18737f6d2b35
TreeHugger Robot [Mon, 24 Apr 2017 21:34:22 +0000 (21:34 +0000)]
Merge "Minor fixes on Autofill Framework:"
TreeHugger Robot [Mon, 24 Apr 2017 21:33:55 +0000 (21:33 +0000)]
Merge changes from topic 'virtual-display-api' into oc-dev
* changes:
Add command line option to set compatibility display properties
Make VR mode virtual display properties customizable
TreeHugger Robot [Mon, 24 Apr 2017 21:33:13 +0000 (21:33 +0000)]
Merge "Even more auto-doc work." into oc-dev
Kang Li [Mon, 24 Apr 2017 21:31:25 +0000 (21:31 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
am:
925d3cf211
Change-Id: I9174e1f12c78ff4f7bbd72446fbf10e09478dbe0
Joachim Sauer [Mon, 24 Apr 2017 21:30:03 +0000 (21:30 +0000)]
Merge "Merge "Deprecate internal Calendar methods." am:
e08bd750c8 am:
5144cd445a am:
30ce9c07ec" into oc-dev-plus-aosp
am:
8b2caae395
Change-Id: I7ef1ace4a696dc5b57ad42b7756e0e3a6efa5c83
Jorim Jaggi [Mon, 24 Apr 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Merge "Insert missing breaks" into oc-dev am:
88db7b39cf" into oc-dev-plus-aosp
am:
9e8ce10496
Change-Id: I36dc9492517009ac866382d8e56b3f0e85d42ea5
Julia Reynolds [Mon, 24 Apr 2017 21:27:39 +0000 (21:27 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev
am:
10e7275965
Change-Id: I1e5293cbd14b23bfffab2e8ff6384ce3c9092a64
Winson Chung [Mon, 24 Apr 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Fix check when finding tasks to reuse. am:
91e5c886c8" into oc-dev-plus-aosp
am:
388fb093be
Change-Id: I441977e51623d0569481e6cab2728b2a938f66fe
Julia Reynolds [Mon, 24 Apr 2017 21:25:55 +0000 (21:25 +0000)]
Merge "Don't consider uri empty a valid sound" into oc-dev
am:
db5f5c3a17
Change-Id: I6ff2dc17f716de58fe4d3f485b6315e7b2bb232b
Todd Kennedy [Mon, 24 Apr 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Merge "fix service binding" into oc-dev am:
4eaeb91e42" into oc-dev-plus-aosp
am:
af6b454b14
Change-Id: I55e0a3543202407577b6ebd433fdb8b406125137
Kang Li [Mon, 24 Apr 2017 21:21:34 +0000 (21:21 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev
Julia Reynolds [Mon, 24 Apr 2017 21:17:12 +0000 (21:17 +0000)]
Merge "Don't allow devs to create blocked channels" into oc-dev
Todd Kennedy [Mon, 24 Apr 2017 21:17:04 +0000 (21:17 +0000)]
Merge "Merge "Remove @TestApi annotation" into oc-dev am:
1ab9119f50" into oc-dev-plus-aosp
am:
3855f370d9
Change-Id: I9bb1800ea0b3adba259994300aa7f54eb1a0e5cf
Julia Reynolds [Mon, 24 Apr 2017 21:16:57 +0000 (21:16 +0000)]
Merge "Don't consider uri empty a valid sound" into oc-dev
Charles He [Mon, 24 Apr 2017 21:12:58 +0000 (21:12 +0000)]
Merge "Merge "Add a11y voice for the VPN icon in status bar" into oc-dev am:
274442e334" into oc-dev-plus-aosp
am:
59179b499a
Change-Id: I6ce10b08136f3ed9615897237a1404fa6400fb50
Jean-Michel Trivi [Mon, 24 Apr 2017 18:59:29 +0000 (11:59 -0700)]
AudioService: make PlaybackActivityMonitor less log-chatty
Do not log error messages on release errors.
Do not try to terminate VolumeShaper when releasing a player.
Use coding convention for "private" and "static" keywords.
Test: make
Change-Id: Ic1ff376c1ce4750708c368756f7b4a8a2c05c50c
Santos Cordon [Mon, 24 Apr 2017 21:10:09 +0000 (21:10 +0000)]
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev
am:
5d1c65971f
Change-Id: I7fd206511601b378b17c042c23a4a761b212241a
Hugo Benichi [Mon, 24 Apr 2017 21:09:19 +0000 (21:09 +0000)]
Merge "Merge "Move byte logics from ApfFilter into BitsUtil" am:
21b9b3a8ff am:
12c1074c8b am:
a80bb82b4e" into oc-dev-plus-aosp
am:
79ffb5a284
Change-Id: I9674c965169fd9dfd0412c80d9362f891bdeb59d
Wale Ogunwale [Mon, 24 Apr 2017 21:05:00 +0000 (21:05 +0000)]
Merge "Merge "Fixed pinned stack lockscreen interaction" into oc-dev am:
681a28d555" into oc-dev-plus-aosp
am:
271e29d124
Change-Id: I83f4ec914a91bf6a7024fa695e85cd2aa9fb3ef2
TreeHugger Robot [Mon, 24 Apr 2017 21:01:00 +0000 (21:01 +0000)]
Merge "Clean up ImageReader when VrMode is disabled." into oc-dev
Felipe Leme [Mon, 24 Apr 2017 20:56:16 +0000 (20:56 +0000)]
Merge "Replaced getUrl() by getWebDomain()." into oc-dev
am:
ffef2ad2b0
Change-Id: Ie26d572f9b45d82231d31546e47f7080526ed23f
Hugo Benichi [Mon, 24 Apr 2017 20:51:54 +0000 (20:51 +0000)]
Merge "Merge "Add BitUtils bit packing methods (Connectivity metrics: add transports pretty printing)" am:
10b5024d5e am:
23d41ee68e am:
876ebaa8e1" into oc-dev-plus-aosp
am:
584f97470c -s ours
Change-Id: Icb2bf64f15e720dc33c870bc23538b03a0a34dd6
TreeHugger Robot [Mon, 24 Apr 2017 20:45:54 +0000 (20:45 +0000)]
Merge "Replaced getUrl() by getWebDomain()." into oc-dev
Abodunrinwa Toki [Mon, 24 Apr 2017 20:44:40 +0000 (20:44 +0000)]
Merge "Undeprecate WebView.findAddress am:
3f3354e087" into oc-dev-plus-aosp
am:
51848baf1b
Change-Id: I322ac2cc8d648b511f8276def7c0422157971d83
Eugene Susla [Mon, 24 Apr 2017 20:42:10 +0000 (20:42 +0000)]
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev
am:
e4964118c6
Change-Id: I43b0b54fa57713a2d2b2f65f34356dc13f533009
Abodunrinwa Toki [Mon, 24 Apr 2017 20:36:20 +0000 (20:36 +0000)]
Merge changes from topic 'am-
bbd64631c3584513a9a39c2ec7139a27' into oc-dev-plus-aosp
am:
9f17850a67
Change-Id: I2fb3c54ad622055353f6cec77088eaa5924bafa6
Amith Yamasani [Mon, 24 Apr 2017 20:36:12 +0000 (20:36 +0000)]
Merge "Add link to class with constants" into oc-dev
am:
6c0f8dc0b0
Change-Id: I98dab756a117a46b62aa5ea50e7f998d9747017e
Abodunrinwa Toki [Mon, 24 Apr 2017 20:34:52 +0000 (20:34 +0000)]
Hide TextClassificationManager.detectLanguages API am:
8557802248
am:
dc3a44ec33
Change-Id: I8b6edfe8ef1b9c97d660c99ee89502953b913857
Robert Carr [Mon, 24 Apr 2017 20:34:18 +0000 (20:34 +0000)]
Merge "Prevent leak of AppWindowTokens." into oc-dev
am:
53845068f4
Change-Id: I9699429dfe2e7ab15b42f1459b0c9b1d6644cde1
TreeHugger Robot [Mon, 24 Apr 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev
TreeHugger Robot [Mon, 24 Apr 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Add link to class with constants" into oc-dev
Jorim Jaggi [Mon, 24 Apr 2017 20:28:38 +0000 (20:28 +0000)]
Merge "Merge "Follow-up for I8cbf1bfbebc917b03f528f040bb019d193228bbb" into oc-dev am:
6adb089cab" into oc-dev-plus-aosp
am:
02cdcd1285
Change-Id: I192473f1613629419027bfe39d8c293d8c860436
Android Build Merger (Role) [Mon, 24 Apr 2017 20:24:48 +0000 (20:24 +0000)]
Merge "Merge "Merge "Call removeMessages() only for certain operations in BackupManagerService#handleCancel()" into oc-dev am:
5281775760" into oc-dev-plus-aosp am:
254d2512d3"
TreeHugger Robot [Mon, 24 Apr 2017 20:24:16 +0000 (20:24 +0000)]
Merge "Prevent leak of AppWindowTokens." into oc-dev
Anton Philippov [Mon, 24 Apr 2017 20:24:01 +0000 (20:24 +0000)]
Merge "Merge "Call removeMessages() only for certain operations in BackupManagerService#handleCancel()" into oc-dev am:
5281775760" into oc-dev-plus-aosp
am:
254d2512d3
Change-Id: I76640f881b58c03b73fda80ff2536eb2a966d5ab
Android Build Merger (Role) [Mon, 24 Apr 2017 20:23:32 +0000 (20:23 +0000)]
Merge "Merge "Merge "Send directed broadcast to the installer" into oc-dev am:
08896b34ac" into oc-dev-plus-aosp am:
19f955ca22"
Todd Kennedy [Mon, 24 Apr 2017 20:22:44 +0000 (20:22 +0000)]
Merge "Merge "Send directed broadcast to the installer" into oc-dev am:
08896b34ac" into oc-dev-plus-aosp
am:
19f955ca22
Change-Id: I1238ef7c6cc59400b656069008f78d205e11d330
Android Build Merger (Role) [Mon, 24 Apr 2017 20:22:08 +0000 (20:22 +0000)]
Merge "Merge "Merge "Fix cast dialog dismiss on home/recents" into oc-dev am:
5c0f27a24b" into oc-dev-plus-aosp am:
9af66b3521"
Jason Monk [Mon, 24 Apr 2017 20:21:20 +0000 (20:21 +0000)]
Merge "Merge "Fix cast dialog dismiss on home/recents" into oc-dev am:
5c0f27a24b" into oc-dev-plus-aosp
am:
9af66b3521
Change-Id: Ia8c4aa8371c2cc910194c77b4053a3ac865affcd
Android Build Merger (Role) [Mon, 24 Apr 2017 20:20:50 +0000 (20:20 +0000)]
Merge "Merge "Merge "Fix QS size on 320dp with big fonts" into oc-dev am:
5667b6ba1d" into oc-dev-plus-aosp am:
d6b13bc235"
Jason Monk [Mon, 24 Apr 2017 20:20:08 +0000 (20:20 +0000)]
Merge "Merge "Fix QS size on 320dp with big fonts" into oc-dev am:
5667b6ba1d" into oc-dev-plus-aosp
am:
d6b13bc235
Change-Id: Ie54e2c3f63e250061acdce98dd29ea33e8764afc
Android Build Merger (Role) [Mon, 24 Apr 2017 20:19:43 +0000 (20:19 +0000)]
Merge "Merge "Merge "Don't reinflate signal cluster after inflate" into oc-dev am:
58ad9aac6d" into oc-dev-plus-aosp am:
dbb70d4eb8"
Tomasz Wasilczyk [Mon, 24 Apr 2017 20:19:05 +0000 (20:19 +0000)]
Merge "Pass radio HAL callbacks back to Java client."
Jason Monk [Mon, 24 Apr 2017 20:17:29 +0000 (20:17 +0000)]
Merge "Merge "Don't reinflate signal cluster after inflate" into oc-dev am:
58ad9aac6d" into oc-dev-plus-aosp
am:
dbb70d4eb8
Change-Id: I5f46389095d5bb5471394ca1dcc4adaa6c40e3f4
Pankaj Kanwar [Mon, 24 Apr 2017 20:16:43 +0000 (20:16 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
f02b7b7ba6 am:
4ef0e826c4
am:
b12a7c8058 -s ours
Change-Id: Ie3be07dc420536b7531f42ca26d06bc3fa97c6af
Jason Monk [Mon, 24 Apr 2017 20:15:33 +0000 (20:15 +0000)]
Merge "Merge "Fix QS detail panels RTL" into oc-dev am:
54774a44be" into oc-dev-plus-aosp
am:
0b2643dad0
Change-Id: I581028d69904369040e9bf4d3ec012bf5756e50b
Robin Lee [Mon, 24 Apr 2017 20:13:10 +0000 (20:13 +0000)]
Merge "Merge "Remove unused network management RPCs" am:
53a122986d am:
10ebc1879b am:
8b90758b25" into oc-dev-plus-aosp
am:
7a98adc8fb
Change-Id: I16ddb6384d30ecdac114c3a51876bb2e3fa5d0c1
Jason Monk [Mon, 24 Apr 2017 20:11:02 +0000 (20:11 +0000)]
Merge "Fix QS shadow disappearing on expand." into oc-dev am:
1ee4c1904b
am:
401331a0e1
Change-Id: I6c13f600ef50c02c253e7ab14e6ed85835185549
Pankaj Kanwar [Mon, 24 Apr 2017 20:09:56 +0000 (20:09 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
f02b7b7ba6
am:
4ef0e826c4
Change-Id: I478837412fb4c76ac8d18fed5a5c441bf2d835b3
Nicolas Geoffray [Mon, 24 Apr 2017 20:04:10 +0000 (20:04 +0000)]
Drop REASON_FORCED_DEXOPT. am:
9cea1d28dd
am:
a98414fe89
Change-Id: I8cd5d3d44483b41593d11f0875c13d40067c5d36
Pankaj Kanwar [Mon, 24 Apr 2017 20:04:05 +0000 (20:04 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am:
f02b7b7ba6
Change-Id: Iaaefbd5b0771a945035e4cddb219a86b2519607c
OSDN Git Service
