OSDN Git Service
Felipe Leme [Wed, 26 Apr 2017 19:05:13 +0000 (19:05 +0000)]
Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev am:
5f7979222d
am:
58510a2d6b
Change-Id: I2850e33f2be4970aeac8ca1bd0f61703a73b18db
Sundeep Ghuman [Wed, 26 Apr 2017 18:54:03 +0000 (18:54 +0000)]
Merge changes from topic 'wifitracker' into oc-dev am:
b57b3dfc3e
am:
157525ab6a
Change-Id: I17e06926ad909ebe8664a71f99261962edb7424d
Felipe Leme [Wed, 26 Apr 2017 18:50:39 +0000 (18:50 +0000)]
Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev
am:
5f7979222d
Change-Id: I64c55257b3652f1435f7beba1640fc0081ce4229
Sundeep Ghuman [Wed, 26 Apr 2017 18:45:00 +0000 (18:45 +0000)]
Merge changes from topic 'wifitracker' into oc-dev
am:
b57b3dfc3e
Change-Id: I98df76a59575e2814b39c0afa2e725c6b5622e17
Felipe Leme [Wed, 26 Apr 2017 18:38:12 +0000 (18:38 +0000)]
Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev
Sundeep Ghuman [Wed, 26 Apr 2017 18:32:42 +0000 (18:32 +0000)]
Merge changes from topic 'wifitracker' into oc-dev
* changes:
Use synchronization rather than locking in WifiTracker.
Remove all pending callbacks in stopTracking.
Nathan Harold [Wed, 26 Apr 2017 18:17:40 +0000 (18:17 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev am:
35eb324bf1
am:
8a82e7d548
Change-Id: Idf7ca8bc14ba2502ed35fbaa452f7eb49a66be78
Seigo Nonaka [Wed, 26 Apr 2017 18:13:40 +0000 (18:13 +0000)]
Merge "Load font file from remote provider synchronously." into oc-dev am:
1c661d1943
am:
6c0dd10a7c
Change-Id: Ifc66af9b116093e3d63bfedd1782f017a7126d3a
Nathan Harold [Wed, 26 Apr 2017 18:10:04 +0000 (18:10 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev
am:
35eb324bf1
Change-Id: Iba429d1d96e28ccaf95d721b8b13cd107d4a0454
Seigo Nonaka [Wed, 26 Apr 2017 18:08:29 +0000 (18:08 +0000)]
Merge "Update FontsContract.requestFonts" into oc-dev am:
57dc8328f5
am:
927353aa3e
Change-Id: I81c18b59201641440da1d4678722c7c7e5a81771
Nathan Harold [Wed, 26 Apr 2017 18:02:49 +0000 (18:02 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 18:02:17 +0000 (18:02 +0000)]
Merge "Load font file from remote provider synchronously." into oc-dev
am:
1c661d1943
Change-Id: I29b540d331a40ad47ad0561ecefb1269cb76a188
Seigo Nonaka [Wed, 26 Apr 2017 17:59:59 +0000 (17:59 +0000)]
Merge "Update FontsContract.requestFonts" into oc-dev
am:
57dc8328f5
Change-Id: I0d12ebae014abf185d05bc6dc7a37bdf3c5e44b3
Julia Reynolds [Wed, 26 Apr 2017 17:58:06 +0000 (17:58 +0000)]
Merge "Update app level fields when misc channel is updated" into oc-dev am:
567947d75d
am:
cb01f85aba
Change-Id: I943ed0c1abbf0c5fbf37c83eb0cb7d37dac3a35b
Julia Reynolds [Wed, 26 Apr 2017 17:52:47 +0000 (17:52 +0000)]
Merge "Update app level fields when misc channel is updated" into oc-dev
am:
567947d75d
Change-Id: If11fbece3506301d400294ac5fd56ccc50228085
nharold [Wed, 26 Apr 2017 17:52:39 +0000 (17:52 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am:
01e368f26d am:
939528045a am:
52dab83f7a
am:
9f218096de
Change-Id: Id67890a061c4e7aef91c7dea61e8706cfdd6bc6e
Svetoslav Ganov [Wed, 26 Apr 2017 17:50:10 +0000 (17:50 +0000)]
Merge "Get rid of custom negaitve save button label am:
dc6cccb905" into oc-dev-plus-aosp
am:
c8dda2ad63
Change-Id: Idb3668a644fa3a528811f59121fb0e5e252a82db
Seigo Nonaka [Wed, 26 Apr 2017 17:49:53 +0000 (17:49 +0000)]
Merge "Load font file from remote provider synchronously." into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 17:48:35 +0000 (17:48 +0000)]
Merge "Update FontsContract.requestFonts" into oc-dev
Chen Xu [Wed, 26 Apr 2017 17:48:09 +0000 (17:48 +0000)]
Merge "Extend carrier configs for visual voicemail" am:
f4db619b0b am:
e701b7ab34 am:
a8e971b75c -s ours
am:
75c534ae15 -s ours
Change-Id: I75443804788d24794baa1aca64343f5d0627d702
Adrian Roos [Wed, 26 Apr 2017 17:46:17 +0000 (17:46 +0000)]
Merge "AOD: Fix layout" into oc-dev am:
f84b208a12
am:
2c3fb2b733
Change-Id: Iab89ffd7e778124a73fe6141319fbe7610e9b086
Julia Reynolds [Wed, 26 Apr 2017 17:43:26 +0000 (17:43 +0000)]
Merge "Update app level fields when misc channel is updated" into oc-dev
nharold [Wed, 26 Apr 2017 17:38:58 +0000 (17:38 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am:
01e368f26d am:
939528045a
am:
52dab83f7a
Change-Id: I3bf240b35c3d509c4e016ffe20519c1bda5ab0b3
Adrian Roos [Wed, 26 Apr 2017 17:38:00 +0000 (17:38 +0000)]
Merge "AOD: Remove wake up fully config flag" into oc-dev am:
ce83c81b84
am:
95c71928fd
Change-Id: I1d34072cf451c80f414b9cc06a5af4d391c5220f
Adrian Roos [Wed, 26 Apr 2017 17:36:11 +0000 (17:36 +0000)]
Merge "AOD: Limit visible icons on shelf" into oc-dev am:
6b7c0e9da8
am:
c1b183a583
Change-Id: I508c66894bd3b859f0c7d81510132b1d3b580bab
Dongwon Kang [Wed, 26 Apr 2017 17:34:17 +0000 (17:34 +0000)]
Merge "TIF: fix documentation in TvContract" into oc-dev am:
e1a795379d
am:
edf3936f17
Change-Id: I0c65d242166c734dc82b3a04c8132683760c4e63
Jean-Michel Trivi [Wed, 26 Apr 2017 17:32:23 +0000 (17:32 +0000)]
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev am:
c4a169cfb4
am:
ecbe5f0305
Change-Id: Ic534a390b4d2ba25a5b330e1abc65814d4e5c992
nharold [Wed, 26 Apr 2017 17:31:23 +0000 (17:31 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am:
01e368f26d
am:
939528045a
Change-Id: Ic415f9f6d45f8c2477c3708c87af31ef725aa224
nharold [Wed, 26 Apr 2017 17:21:52 +0000 (17:21 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
am:
01e368f26d
Change-Id: I82c0bf9fe401accd6928e411739f658966ac87a6
Philip P. Moltmann [Wed, 26 Apr 2017 17:20:14 +0000 (17:20 +0000)]
Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev am:
dd91a5636b
am:
934238ff22
Change-Id: Ief2c8bcae4c39a7f51d368cb2b0426deea6bae99
Wale Ogunwale [Wed, 26 Apr 2017 17:15:09 +0000 (17:15 +0000)]
Merge "Reduce use of static variables in window manager unit tests" into oc-dev am:
0f8764485b
am:
2fcba5d920
Change-Id: I25e60066a85cac59fd002ab5153f3db125e8aa6d
Narayan Kamath [Wed, 26 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Improvements to ActivityManagerService stack dumping" am:
2529f65e87 am:
9e9270ee3d am:
30ad6b8cee -s ours
am:
eaecc4397c -s ours
Change-Id: I4b29aa84f097314346323e101acb172e09ae9392
nharold [Wed, 26 Apr 2017 17:10:32 +0000 (17:10 +0000)]
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm"
Android Build Merger (Role) [Wed, 26 Apr 2017 17:05:45 +0000 (17:05 +0000)]
Merge "Get rid of custom negaitve save button label am:
dc6cccb905" into oc-dev-plus-aosp
Svetoslav Ganov [Wed, 26 Apr 2017 17:04:59 +0000 (17:04 +0000)]
Get rid of custom negaitve save button label
am:
dc6cccb905
Change-Id: Ib92a9487a18c821199cc8c13b7b4353cbe5c1f99
Chen Xu [Wed, 26 Apr 2017 17:02:55 +0000 (17:02 +0000)]
Merge "Extend carrier configs for visual voicemail" am:
f4db619b0b am:
e701b7ab34
am:
a8e971b75c -s ours
Change-Id: Ib417f2a9cd1c0c446f24d65ff55d9d6a72004c6b
Chen Xu [Wed, 26 Apr 2017 16:58:07 +0000 (16:58 +0000)]
Merge "Extend carrier configs for visual voicemail" am:
f4db619b0b
am:
e701b7ab34
Change-Id: I76289584e478c2e287c6fc66f75d3771cd502729
Adrian Roos [Wed, 26 Apr 2017 16:57:20 +0000 (16:57 +0000)]
Merge "AOD: Fix layout" into oc-dev
am:
f84b208a12
Change-Id: Ifd1cc55308896a69a805d80d56f321eb272d8bf8
Adrian Roos [Wed, 26 Apr 2017 16:53:18 +0000 (16:53 +0000)]
Merge "AOD: Remove wake up fully config flag" into oc-dev
am:
ce83c81b84
Change-Id: I7295e4bb27e863dd144d1f79068f9e00a249368e
Chen Xu [Wed, 26 Apr 2017 16:51:22 +0000 (16:51 +0000)]
Merge "Extend carrier configs for visual voicemail"
am:
f4db619b0b
Change-Id: I0ae8f81fde3ca866c6be897311243b6225341296
Adrian Roos [Wed, 26 Apr 2017 16:51:13 +0000 (16:51 +0000)]
Merge "AOD: Limit visible icons on shelf" into oc-dev
am:
6b7c0e9da8
Change-Id: Ife25cd6f91ec6997267e8fdd6b82b78b4bac8223
Svetoslav Ganov [Tue, 25 Apr 2017 01:11:27 +0000 (18:11 -0700)]
Get rid of custom negaitve save button label
Removed the ability for an autofill provider to set
a custom string for the negative button. Also make
the old hidden APIs non-abstract to avoid runime
crashes for unimplemented methods.
Test: CtsAutoFillServiceTestCases pass
bug:
37649790
Change-Id: If776d26de48382eeb064bdead5d4d5fdb0ff2e7e
Adrian Roos [Wed, 26 Apr 2017 16:43:50 +0000 (16:43 +0000)]
Merge "AOD: Fix layout" into oc-dev
Adrian Roos [Wed, 26 Apr 2017 16:43:30 +0000 (16:43 +0000)]
Merge "AOD: Remove wake up fully config flag" into oc-dev
Adrian Roos [Wed, 26 Apr 2017 16:43:19 +0000 (16:43 +0000)]
Merge "AOD: Limit visible icons on shelf" into oc-dev
Chen Xu [Wed, 26 Apr 2017 16:42:09 +0000 (16:42 +0000)]
Merge "Extend carrier configs for visual voicemail"
Dongwon Kang [Wed, 26 Apr 2017 16:27:39 +0000 (16:27 +0000)]
Merge "TIF: fix documentation in TvContract" into oc-dev
am:
e1a795379d
Change-Id: Ibe63e4397fac8c1a5d0190ae10dcf4598e1fd1ca
Dongwon Kang [Wed, 26 Apr 2017 16:22:08 +0000 (16:22 +0000)]
Merge "TIF: fix documentation in TvContract" into oc-dev
Jean-Michel Trivi [Wed, 26 Apr 2017 15:33:34 +0000 (15:33 +0000)]
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev
am:
c4a169cfb4
Change-Id: Iad6d5099e2c1b7dbeaf53cb5fcbf21ed7469b55e
Jean-Michel Trivi [Wed, 26 Apr 2017 15:26:59 +0000 (15:26 +0000)]
Merge "Audio focus enforcement: duck automatically apps for SDK O+" into oc-dev
Philip P. Moltmann [Wed, 26 Apr 2017 14:22:48 +0000 (14:22 +0000)]
Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
am:
dd91a5636b
Change-Id: I1b75b8e8ef125620817a1baaea0431b041871bae
Philip P. Moltmann [Wed, 26 Apr 2017 14:16:46 +0000 (14:16 +0000)]
Merge changes from topics 'AutofillContext2', 'AutofillContext' into oc-dev
* changes:
Return all previous FillContexts onFill
Report multiple FillContext-s onSave
Wale Ogunwale [Wed, 26 Apr 2017 12:39:11 +0000 (12:39 +0000)]
Merge "Reduce use of static variables in window manager unit tests" into oc-dev
am:
0f8764485b
Change-Id: Ia10f8954ec3524cd76f0327f8edc0bb04f90915d
Wale Ogunwale [Wed, 26 Apr 2017 12:35:08 +0000 (12:35 +0000)]
Merge "Reduce use of static variables in window manager unit tests" into oc-dev
Narayan Kamath [Wed, 26 Apr 2017 12:24:13 +0000 (12:24 +0000)]
Merge "Improvements to ActivityManagerService stack dumping" am:
2529f65e87 am:
9e9270ee3d
am:
30ad6b8cee -s ours
Change-Id: Ic2ba253aabaa9f39f9825d9ab6c69d98b7ace5dc
Narayan Kamath [Wed, 26 Apr 2017 12:18:05 +0000 (12:18 +0000)]
Merge "Improvements to ActivityManagerService stack dumping" am:
2529f65e87
am:
9e9270ee3d
Change-Id: I273b307256c3bf6d2255a7c092c4985c90d26942
Narayan Kamath [Wed, 26 Apr 2017 12:12:29 +0000 (12:12 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
am:
2529f65e87
Change-Id: Iabbf138719296a882aa98261fb2c4da8bbf027cc
Narayan Kamath [Wed, 26 Apr 2017 12:01:15 +0000 (12:01 +0000)]
Merge "Improvements to ActivityManagerService stack dumping"
Michal Karpinski [Wed, 26 Apr 2017 10:49:00 +0000 (11:49 +0100)]
resolve merge conflicts of
970525ef3225 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4860b81fbd1f45e6594197b1de75ff3531c4826
Jakub Pawlowski [Wed, 26 Apr 2017 10:19:25 +0000 (10:19 +0000)]
Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev am:
5df218c5c4 -s ours
am:
92502878a1
Change-Id: I42ba60d66511f569c40677dd834d2a045328465f
Michal Karpinski [Wed, 26 Apr 2017 10:15:16 +0000 (10:15 +0000)]
Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev
am:
c38e2af0d1
Change-Id: I60cc10f8c1e734c5c701cf461ed1f18c3c1d10fa
Jakub Pawlowski [Wed, 26 Apr 2017 10:13:19 +0000 (10:13 +0000)]
Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
am:
5df218c5c4 -s ours
Change-Id: Ie541540172e4e34869d37ae7f4824d055a363ef1
Michal Karpinski [Wed, 26 Apr 2017 09:44:49 +0000 (09:44 +0000)]
Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main thread to another thread" into oc-dev
Jakub Pawlowski [Wed, 26 Apr 2017 08:16:48 +0000 (08:16 +0000)]
Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev
* changes:
Bluetooth: expand comments on new PHY constants
Bluetooth: document status value in PHY read/update
Bluetooth: Add handler parameter to connectGatt
Get rid of the IAdvertiserCallabck
Nathan Harold [Tue, 25 Apr 2017 21:21:52 +0000 (14:21 -0700)]
Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.
Bug:
37681043
Test: make update-api and make
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
Joe Fernandez [Wed, 26 Apr 2017 05:17:03 +0000 (05:17 +0000)]
Merge "docs: Update ListView JavaDoc comments" into oc-dev am:
bc6c82c20d
am:
2af635339e
Change-Id: If056887bb290c78d41a32ed679abc61f646e2d28
Joe Fernandez [Wed, 26 Apr 2017 05:15:14 +0000 (05:15 +0000)]
Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev am:
0de19fcf6a
am:
6eb2726d40
Change-Id: Ica7261d081dd4e1a4a287732a5c4c8261e9b3e99
Joe Fernandez [Wed, 26 Apr 2017 05:09:28 +0000 (05:09 +0000)]
Merge "docs: Update ListView JavaDoc comments" into oc-dev
am:
bc6c82c20d
Change-Id: Iffe54d8fffee067e08d8da194fb8d3e984d46708
Joe Fernandez [Wed, 26 Apr 2017 05:06:58 +0000 (05:06 +0000)]
Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev
am:
0de19fcf6a
Change-Id: Ic2caf678a0231344b5e26f7641b2570394ad857a
Joe Fernandez [Wed, 26 Apr 2017 04:56:06 +0000 (04:56 +0000)]
Merge "docs: Update ListView JavaDoc comments" into oc-dev
Joe Fernandez [Wed, 26 Apr 2017 04:55:33 +0000 (04:55 +0000)]
Merge "docs: Update ArrayAdapter JavaDoc comments" into oc-dev
Seigo Nonaka [Wed, 26 Apr 2017 04:06:37 +0000 (21:06 -0700)]
Load font file from remote provider synchronously.
Since CancellationSignal is not guaranteed to be handled by remote
process, introduce threaded font loading mechanism.
At the same time, this fixes possible NPE issue in openFont.
Bug:
37552479
Test: am instrument -w -e class android.provider.FontsContractE2ETest
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
Change-Id: Ie235c5a57bd172b0882da5aa27a990d7c6686ff2
Wale Ogunwale [Wed, 26 Apr 2017 03:29:13 +0000 (20:29 -0700)]
Reduce use of static variables in window manager unit tests
This was causing test cross-contamination since different test might
expect different states from the variables.
Bug:
37682538
Test: tons of it!
Change-Id: Ie8a1ea400695b6346d7dfa3369b5c44bb467a33d
Felipe Leme [Wed, 26 Apr 2017 03:10:34 +0000 (03:10 +0000)]
Merge "Added missing importantForAutofill values on attributes." into oc-dev am:
6fba10b037
am:
341003106a
Change-Id: I349b8afa3f7d3150fa58e7238924f3f8e2e742e3
Felipe Leme [Wed, 26 Apr 2017 03:02:50 +0000 (03:02 +0000)]
Merge "Added missing importantForAutofill values on attributes." into oc-dev
am:
6fba10b037
Change-Id: Icfe6f41e86b8b47fad7737acb83c25eff912fd93
Seigo Nonaka [Wed, 26 Apr 2017 02:39:23 +0000 (19:39 -0700)]
Update FontsContract.requestFonts
- Change FontsContract.requestFont plural form to meet other method
naming convension.
- Change FontsContract.requestFonts to accept CancellationSignal to
be able to notify to remote.
Bug:
37326126
Test: am instrument -w -e class android.provider.FontsContractE2ETest
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
Change-Id: I154f943eb4e7c91bff8afd86be479f72e66e5cb7
Felipe Leme [Wed, 26 Apr 2017 02:56:04 +0000 (02:56 +0000)]
Merge "Added missing importantForAutofill values on attributes." into oc-dev
Svetoslav Ganov [Wed, 26 Apr 2017 02:24:31 +0000 (02:24 +0000)]
Make sure autofill service is backed up am:
d8561a26da
am:
92e412dfb3
Change-Id: If46c616d922701493f797be1919b158707bc5574
Svetoslav Ganov [Wed, 26 Apr 2017 02:16:43 +0000 (02:16 +0000)]
Make sure autofill service is backed up
am:
d8561a26da
Change-Id: I6964ccdc64621e4aab330afc2c0faa836d35dced
Svetoslav Ganov [Tue, 25 Apr 2017 22:26:03 +0000 (15:26 -0700)]
Make sure autofill service is backed up
Test: manual
bug:
36638606
Change-Id: I3367b9eb40a542267fb5d49f9a8bb7aa97ca57fa
Dongwon Kang [Wed, 26 Apr 2017 01:22:38 +0000 (01:22 +0000)]
Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev am:
a35e4e5584
am:
de938e3695
Change-Id: I1a345ce26aea1946d42c8b79eaf9981ae80bbea6
Todd Kennedy [Wed, 26 Apr 2017 01:16:00 +0000 (01:16 +0000)]
Merge "Merge "Add concept of implicitly exposed components" into oc-dev am:
0a4b7f5a86" into oc-dev-plus-aosp
am:
eeb311e47d
Change-Id: I3857f3d588497024caab36d6a3a11f9374018c78
Wale Ogunwale [Wed, 26 Apr 2017 01:12:10 +0000 (01:12 +0000)]
Merge "Merge "Remove @Presubmit annotation from SettingBackupTest" into oc-dev am:
e44e9e94da" into oc-dev-plus-aosp
am:
13bda11ce2
Change-Id: I55947258f3c8467649d52dafd78cbff73822d530
Pankaj Kanwar [Wed, 26 Apr 2017 01:05:58 +0000 (01:05 +0000)]
Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." am:
3a8ad81ab4 am:
a086824e5a am:
6f048ffab5 -s ours
am:
63b5ec1155 -s ours
Change-Id: I4d5f6aff90c4c9843748e2d51053ccccb7515a18
Chris Craik [Wed, 26 Apr 2017 01:04:02 +0000 (01:04 +0000)]
Merge "Fix include" into oc-dev am:
7e44951bb7
am:
4554fa6b7c
Change-Id: I44871c8098ffc01ca86dd8c16657cacaf26be3b3
Peng Xu [Wed, 26 Apr 2017 01:01:48 +0000 (01:01 +0000)]
Merge "Return correct value at initDataInjection and avoid crash" into oc-dev am:
1c5b71ec1f
am:
b66e6c26d1
Change-Id: I110c83decf811d388095ee307dcb2c6b5e41e81f
Chris Craik [Wed, 26 Apr 2017 00:59:58 +0000 (00:59 +0000)]
Merge "Fix ViewOverlay#onDescendantInvalidated" into oc-dev am:
db8f2fc025
am:
a08dd9fff3
Change-Id: Icd0035e3b21e679f3fff01d165b5b3170b497929
Makoto Onuki [Wed, 26 Apr 2017 00:54:07 +0000 (00:54 +0000)]
Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev am:
781c8cb65e
am:
1ddaa67a59
Change-Id: Ice1a513a00e4b8962b11db6091f0bfe9e0f279f1
Winson Chung [Wed, 26 Apr 2017 00:51:00 +0000 (00:51 +0000)]
Merge "Ensuring that isPictureInPictureMode() mirrors dispatched mode." into oc-dev am:
5b4e16c3a5
am:
d02aa22f18
Change-Id: I2b689c23fbb1fb6157ab7f57d67315152888a713
Hall Liu [Wed, 26 Apr 2017 00:49:07 +0000 (00:49 +0000)]
Merge "Add Error specifiers to the API." am:
4c4a55a67b am:
f729fccde9 am:
65030630fd
am:
84c1ff86f6
Change-Id: Ie7ee3cdf9fa2a75a88f68c5fe7d7c4e28d91b549
Eino-Ville Talvala [Wed, 26 Apr 2017 00:46:33 +0000 (00:46 +0000)]
Merge "Camera: Update docs for new auto-generation features" into oc-dev am:
f879357cae
am:
50c37ee12e
Change-Id: I1c0c83a92bcf8fce2670d6bcd68415ac3585b9e3
Chen Xu [Wed, 26 Apr 2017 00:43:47 +0000 (00:43 +0000)]
Merge "Merge "Add VisualVoicemailService" am:
8c6925a88f am:
ac78d9ae25 am:
6c65be4d3e -s ours" into oc-dev-plus-aosp
am:
3b328b0402 -s ours
Change-Id: Idbb0a16aec8f34b03f2d5e146ebffa20bcdfef28
Chen Xu [Wed, 26 Apr 2017 00:43:39 +0000 (00:43 +0000)]
Merge "Add VisualVoicemailService" am:
8c6925a88f am:
ac78d9ae25 am:
6c65be4d3e -s ours
am:
9e3b41ddef -s ours
Change-Id: Id809127620df186cdc05eaa408427e21a8b45a90
Jeff Sharkey [Wed, 26 Apr 2017 00:41:04 +0000 (00:41 +0000)]
Merge "Fix some issues found by new doclava linter." into oc-dev am:
a00c7c0a99
am:
db73950734
Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d
Seigo Nonaka [Wed, 26 Apr 2017 00:39:15 +0000 (00:39 +0000)]
Merge "Font provider cleaning ups." into oc-dev am:
5313eee98a
am:
a3d5786a3d
Change-Id: Ic9a30e9bf8404c3a469bb0c998fd876ee94a3488
Eugene Susla [Wed, 26 Apr 2017 00:36:49 +0000 (00:36 +0000)]
Merge "Remove underscore from Companion service name" into oc-dev am:
885b5f4466
am:
56620feed0
Change-Id: I3a35f668dde82a8ccb1094988943039b4c93e4fa
Dongwon Kang [Wed, 26 Apr 2017 00:35:39 +0000 (00:35 +0000)]
Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev
am:
a35e4e5584
Change-Id: I44b887de9aa6ef402ba0b6ee1092fd9274ba3fcb
Fan Zhang [Wed, 26 Apr 2017 00:34:54 +0000 (00:34 +0000)]
Merge "Add tests for iconSpaceReserved attribute in Preference" into oc-dev am:
105f55ee8f
am:
488db94e16
Change-Id: Icad5cf4ab4a96c100ba4ff3184ac90d7afc5bc96
Adrian Roos [Wed, 26 Apr 2017 00:30:16 +0000 (00:30 +0000)]
Merge "ImmersiveCling: Allow interacting with underlying view" into oc-dev am:
afad82ba85
am:
792b8d6e6c
Change-Id: I8e80caaa8df899f83df8aacedfb16005148a58bf
TreeHugger Robot [Wed, 26 Apr 2017 00:27:53 +0000 (00:27 +0000)]
Merge "TIF: remove c-tor for WatchNextProgram" into oc-dev
OSDN Git Service
