git.osdn.net Git - android-x86/frameworks-base.git/log

Dan Sandler [Mon, 19 Jun 2017 20:56:24 +0000 (20:56 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev am: 5e3fb57af8
am: 0346448a46

Change-Id: Ib361e9e63dae3b0f163f800af8995762070d8c60

commit | commitdiff | tree

Dan Sandler [Mon, 19 Jun 2017 20:45:20 +0000 (20:45 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev
am: 5e3fb57af8

Change-Id: I6835b0804b66ad0ee0ff682b29a728f3cceca0bf

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 20:35:44 +0000 (20:35 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96 am: d974296f8c
am: b5475ab595

Change-Id: If6c24d1af51bd12ef52b546c610cb2b825c34f88

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 20:32:13 +0000 (20:32 +0000)]

Merge "Reduce no-op notification log messages." into oc-dev

commit | commitdiff | tree

Qingxi Li [Mon, 19 Jun 2017 20:16:11 +0000 (20:16 +0000)]

Merge "Use EuiccManager API to disable current carrier." into oc-dr1-dev
am: 7979566c72

Change-Id: I37b2cb8245853b54bb8a8eab92eadec2ed94c63d

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 20:16:07 +0000 (20:16 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96
am: d974296f8c

Change-Id: I61d4f04ec27b0298c9ab77dd92bf14d44a1ed93f

commit | commitdiff | tree

Qingxi Li [Mon, 19 Jun 2017 20:07:51 +0000 (20:07 +0000)]

Merge "Use EuiccManager API to disable current carrier." into oc-dr1-dev

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 20:03:42 +0000 (20:03 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2'
am: e601160a96

Change-Id: Icb84816dc98198ad6ed85dd8b030fbd0198d73a4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 20:02:03 +0000 (20:02 +0000)]

Merge "Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev am: 280acdb88b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Yohei Yukawa [Mon, 19 Jun 2017 20:01:06 +0000 (20:01 +0000)]

Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev
am: 280acdb88b

Change-Id: Ia58a8d9ad1c387af2fc6c66f928379df08d6792a

commit | commitdiff | tree

Jakub Pawlowski [Mon, 19 Jun 2017 19:53:44 +0000 (19:53 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used" am: 42b1578867 am: de1f0d7607
am: 8dce179b79

Change-Id: Ic861fcf0507546f522046193939488607a01a042

commit | commitdiff | tree

Hall Liu [Mon, 19 Jun 2017 19:53:40 +0000 (19:53 +0000)]

Merge changes from topics 'embms-init-fix', 'embms-download-2'

* changes:
Add callback for initialization done
Embms download part 2

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 19:44:45 +0000 (19:44 +0000)]

Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev

commit | commitdiff | tree

Jakub Pawlowski [Mon, 19 Jun 2017 19:40:38 +0000 (19:40 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used" am: 42b1578867
am: de1f0d7607

Change-Id: I89b5be7443dff10a3a52a0b6dbee76a5d34b8173

commit | commitdiff | tree

Jakub Pawlowski [Mon, 19 Jun 2017 19:26:32 +0000 (19:26 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used"
am: 42b1578867

Change-Id: I8f6f49f0d75c840faa8a7dbdb56a1debecd28d97

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Jun 2017 19:17:38 +0000 (19:17 +0000)]

Merge "Remove legacy advertiser from map after it's no longer used"

commit | commitdiff | tree

Daniel Nishi [Mon, 19 Jun 2017 17:55:32 +0000 (17:55 +0000)]

Merge "Flag the DH no threshold options menu." into oc-dr1-dev
am: f69d450b6f

Change-Id: I44ea7994178ca700555479bd5901779c4639f604

commit | commitdiff | tree

Daniel Nishi [Mon, 19 Jun 2017 17:45:16 +0000 (17:45 +0000)]

Merge "Flag the DH no threshold options menu." into oc-dr1-dev

commit | commitdiff | tree

Jakub Pawlowski [Wed, 14 Jun 2017 01:59:07 +0000 (18:59 -0700)]

Remove legacy advertiser from map after it's no longer used

Test: manual
Bug: 62597369
Change-Id: Ief1e1b054f29b59b1ed72514b138d4f209f9847a

Use EuiccManager API to disable current carrier.

Bug: 37353596
Test: existing test
Change-Id: I71e9ab13f48de07d4c7b9e25aabfa3c49dda6fb4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 17:21:15 +0000 (17:21 +0000)]

Merge "Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d8f am: a7853c75b8" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:19:19 +0000 (17:19 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d8f
am: a7853c75b8

Change-Id: Ifc9d98444bffb923ecbda3d125f50e5a1adf396d

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:18:53 +0000 (17:18 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev am: 8a95d49d8f
am: 54c10dca58

Change-Id: Ib4418fa8e1bf1660b622b9015a08a3ea375d2d07

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 17:16:10 +0000 (17:16 +0000)]

Merge "Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f am: 04171ecb31" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:13:26 +0000 (17:13 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am: 8a95d49d8f

Change-Id: I2d59709712d96b78e1bd5d634e6c31cc0a0d6ff0

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:13:23 +0000 (17:13 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f
am: 92d86d59c0

Change-Id: I690ebf4df8e22a57c5f7b2b5e0267a550db15945

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev
am: 8a95d49d8f

Change-Id: I40b069c811b9cc687265f802524b8b290cd4f269

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:13:19 +0000 (17:13 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev am: 58df6ab93f
am: 04171ecb31

Change-Id: I3306e0fd1a7fdf211e330c0a53787f9b1eb5ef1c

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:05:27 +0000 (17:05 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am: 58df6ab93f

Change-Id: Ic6b3aa97edffd87e643a778d73aa61e890f52a4b

commit | commitdiff | tree

Dianne Hackborn [Mon, 19 Jun 2017 17:04:04 +0000 (17:04 +0000)]

Merge "Maybe fix issue #62199092: Alarm didn't ring, upcoming alarm..." into oc-dev

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 17:03:17 +0000 (17:03 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev
am: 58df6ab93f

Change-Id: Icd240aa9e5881067acd7521e4235692c5a538b29

commit | commitdiff | tree

Siyamed Sinir [Mon, 19 Jun 2017 16:53:11 +0000 (16:53 +0000)]

Merge "Fix crash during TextView.onCreateContextMenu" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 15:45:16 +0000 (15:45 +0000)]

Merge "Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10 am: 31c2f1e881" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:43:15 +0000 (15:43 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10
am: 31c2f1e881

Change-Id: Icd1e169bb9538e1ac778469393f4a3be7880368b

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:43:14 +0000 (15:43 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev am: c885c24e10
am: 1a2133629f

Change-Id: I6f3514154e75a74c69bdf5292dc73783e652a9ec

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:33:21 +0000 (15:33 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev
am: c885c24e10

Change-Id: Ibbff840983dc3f15745275d44393645f110b74c1

commit | commitdiff | tree

Jason Monk [Mon, 19 Jun 2017 15:33:12 +0000 (15:33 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev
am: c885c24e10

Change-Id: I70a913e7743e79e90e3d5c1e8bbcb8e6a4071193

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 15:26:11 +0000 (15:26 +0000)]

Merge "Fix flash of ambient on fp unlock" into oc-dev

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 13:37:15 +0000 (13:37 +0000)]

Merge "Make interface IP serving code set LinkProperties" am: 1dae9a4709 am: 9461f78541
am: 5219f643dd

Change-Id: I39a1744a7fa9b91e3b607429c79f39578e9bde19

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 13:26:13 +0000 (13:26 +0000)]

Merge "Make interface IP serving code set LinkProperties" am: 1dae9a4709
am: 9461f78541

Change-Id: I753ab701f2109c0972816724e73119dc1dbc4dca

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 13:15:02 +0000 (13:15 +0000)]

Merge "Make interface IP serving code set LinkProperties"
am: 1dae9a4709

Change-Id: I84e4b3fb0be210f59eb663597a6c81c95d3e51d6

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Jun 2017 13:00:34 +0000 (13:00 +0000)]

Merge "Make interface IP serving code set LinkProperties"

commit | commitdiff | tree

Alessio Balsini [Mon, 19 Jun 2017 12:04:37 +0000 (12:04 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()" am: 663b02dd28 am: 6f0adbfaea
am: fd88d146b4

Change-Id: Iab127e59a59c959e9cd100dff68f415415b0bcce

commit | commitdiff | tree

Alessio Balsini [Mon, 19 Jun 2017 11:54:05 +0000 (11:54 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()" am: 663b02dd28
am: 6f0adbfaea

Change-Id: I0626fb2d9de978f204ba9898a56e4225a71f03e8

commit | commitdiff | tree

Alessio Balsini [Mon, 19 Jun 2017 11:43:00 +0000 (11:43 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()"
am: 663b02dd28

Change-Id: I4953cf4bf4af592e080114bf937453b84b4a3e4e

commit | commitdiff | tree

Treehugger Robot [Mon, 19 Jun 2017 11:29:58 +0000 (11:29 +0000)]

Merge "Documentation: changed tid parameter description for getThreadPriority()"

commit | commitdiff | tree

Alessio Balsini [Wed, 7 Jun 2017 09:41:33 +0000 (11:41 +0200)]

Documentation: changed tid parameter description for getThreadPriority()

Wrong description of the "tid" parameter used by getThreadPriority():
the function does not "change" the priority of the thread associated to
"tid".
Defined also the meaning of setting tid parameter to 0.

Test: None

Change-Id: I8552f3b110eaab1aefa51477e82d3e295547be34
Signed-off-by: Alessio Balsini <alessio.balsini@gmail.com>

commit | commitdiff | tree

Erik Kline [Mon, 19 Jun 2017 08:40:21 +0000 (08:40 +0000)]

Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
am: 7284e2a88b -s ours

Change-Id: I90181d2ce6f3c5f65110aa53ae81e657d9894fcd

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 08:31:31 +0000 (08:31 +0000)]

Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev

commit | commitdiff | tree

Erik Kline [Mon, 12 Jun 2017 09:20:08 +0000 (18:20 +0900)]

Make interface IP serving code set LinkProperties

Additionally, clean up awkward IPv6TetheringInterfaceServices
instantiation mechanics.  In future, this class will be absorbed
by TetherInterfaceStateMachine (prior to its renaming to IpServer).

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131

Change-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376

commit | commitdiff | tree

Zhijun He [Mon, 19 Jun 2017 05:04:29 +0000 (05:04 +0000)]

Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev
am: a34c04d5c3

Change-Id: Ie7fbfc6948f19c36a487defffa4ca0a10e8eae66

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 04:56:51 +0000 (04:56 +0000)]

Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev

Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev
am: 38529959bf -s ours

Change-Id: Ie44630dcc12ad16e326c70a6633e509bcf7012ff

Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev

commit | commitdiff | tree

Zhijun He [Sun, 18 Jun 2017 23:21:51 +0000 (16:21 -0700)]

Camera2: copy user tag to HFR request list

User tag is not part of native metadata, and need carry over explicitly.

Test: Camera CTS
Bug: 33761753
Change-Id: Ic58783fc204ce71e073f71d0fa50d4d961f4e7ce

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 18 Jun 2017 17:26:19 +0000 (17:26 +0000)]

Merge "Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7 am: 895b695ab0" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:24:09 +0000 (17:24 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7
am: c36175d754

Change-Id: I74774dac4da9a9f270f3ca66780664c82a1a3c05

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:24:07 +0000 (17:24 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7
am: 895b695ab0

Change-Id: I158aeb4a8327454a067310c7ba51c8487ada5c8d

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:15:12 +0000 (17:15 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev
am: 65ffdba7f7

Change-Id: I4af23140f4d9ecc2c1e9faa09d03eddb22db9dae

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:15:07 +0000 (17:15 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev
am: 65ffdba7f7

Change-Id: Ib58b5ed03daa375c0ba667829d4a38567c99ac78

commit | commitdiff | tree

Todd Kennedy [Sun, 18 Jun 2017 17:06:17 +0000 (17:06 +0000)]

Merge "Track both framework and app overlays per package" into oc-dev

commit | commitdiff | tree

Eric Laurent [Sun, 18 Jun 2017 05:24:33 +0000 (05:24 +0000)]

Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev
am: 95b41415cd

Change-Id: Ib0b79a1526c32fcd7c4cc253feac77ba0f4d3bae

commit | commitdiff | tree

TreeHugger Robot [Sun, 18 Jun 2017 05:15:31 +0000 (05:15 +0000)]

Merge "AudioService: implement safe volume warning for USB Headsets" into oc-dr1-dev

commit | commitdiff | tree

Lucas Dupin [Sat, 17 Jun 2017 17:26:20 +0000 (17:26 +0000)]

Merge "K-Means color clustering" into oc-dr1-dev
am: 11cc260047

Change-Id: If99425cb57a322900f476227932cdcadd85abf00

commit | commitdiff | tree

Lucas Dupin [Sat, 17 Jun 2017 17:20:59 +0000 (17:20 +0000)]

Merge "K-Means color clustering" into oc-dr1-dev

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3a759c93b8 -s ours

Change-Id: Ib4197d83ce8733ae25f2a091d9622dc47205817f

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 11:29:10 +0000 (11:29 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 767d02158e -s ours

Change-Id: I596636ce8d71ce60bb73ef4c95d1df32c0b1d3a0

Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508 -s ours
am: dee1ecf9df -s ours

Change-Id: I135d93838a61fad0211b23aaf5b3b48ef40926b5

Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508 -s ours
am: c4e253af2a -s ours

Change-Id: Iac7e7529df9031b985b24dea82e4e2fc7735a066

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 06:10:52 +0000 (06:10 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

Merge "Import translations. DO NOT MERGE" into oc-dev
am: f0bdfbc508 -s ours

Change-Id: I2d6f99108a1aa2a170aac8d50cc1cf3398223fd2

Merge "Import translations. DO NOT MERGE" into oc-dev
am: f0bdfbc508 -s ours

Change-Id: I451787702af10fa932a1b5fd256c989ee979ba74

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 05:57:54 +0000 (05:57 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

Import translations. DO NOT MERGE

Change-Id: I6dc3d54f22f40b9079b6a7e55def38409cc48e89
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 03:05:09 +0000 (03:05 +0000)]

Merge "Merge "Only preload selected pages" into oc-dev am: 314457a424 am: 4116849cfb" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 03:02:42 +0000 (03:02 +0000)]

Merge "Only preload selected pages" into oc-dev am: 314457a424
am: 1af7c0bdbe

Change-Id: Ia3ecca3507a8d3b2e18dee59f83af0c0804ab68c

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 03:02:37 +0000 (03:02 +0000)]

Merge "Only preload selected pages" into oc-dev am: 314457a424
am: 4116849cfb

Change-Id: I9dd4081136a3a3369f954acdd296b99976a31458

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 02:57:26 +0000 (02:57 +0000)]

Merge "Only preload selected pages" into oc-dev
am: 314457a424

Change-Id: Ice10d16e149ce7807c50b413939cb71caf52f715

commit | commitdiff | tree

Philip P. Moltmann [Sat, 17 Jun 2017 02:55:42 +0000 (02:55 +0000)]

Merge "Only preload selected pages" into oc-dev
am: 314457a424

Change-Id: Id45d32474d29f4e71fa85997088e7a478b659baf

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 02:49:55 +0000 (02:49 +0000)]

Merge "Only preload selected pages" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 02:35:37 +0000 (02:35 +0000)]

Merge "Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e am: a2f661612d" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:32:45 +0000 (02:32 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e
am: a2f661612d

Change-Id: Iff19ad943b40ba317542ddebb505eb27175ac627

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:32:36 +0000 (02:32 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev am: 65c00b2f4e
am: 4127bdafc7

Change-Id: Iee8ffdde7970a5c623f4820d3e27531df2beb795

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:26:02 +0000 (02:26 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev
am: 65c00b2f4e

Change-Id: I543f873621ffa26818d6b237d8ed3d1c7769ad98

commit | commitdiff | tree

Sundeep Ghuman [Sat, 17 Jun 2017 02:25:57 +0000 (02:25 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev
am: 65c00b2f4e

Change-Id: I46fc6ca0334f2637007fc188304310475267a20c

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 02:15:02 +0000 (02:15 +0000)]

Merge "APs from old scans should not have RSSI values set." into oc-dev

commit | commitdiff | tree

Hall Liu [Fri, 16 Jun 2017 21:59:57 +0000 (14:59 -0700)]

Add callback for initialization done

Add callback for initialization done in the framework, and listen to it
in the testapps. Make initialization asynchronous as well for both
download and streaming.

Change-Id: Iea7f803df9d2752401b2eca9f6c7375007cac35e

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 01:47:35 +0000 (01:47 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd am: 7ba9270427
am: ffd0a7d95c

Change-Id: Ia3ac938a14df46beb18d49803732ee953dabf0f3

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 01:41:09 +0000 (01:41 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd
am: 7ba9270427

Change-Id: I28b151f93f00cbd3086e8416dbd433f34806205c

Import translations. DO NOT MERGE

Change-Id: Id2e2ab20c78bfcf7ab82807c33466fed3116236b
Auto-generated-cl: translation import

commit | commitdiff | tree

Myles Watson [Sat, 17 Jun 2017 01:34:00 +0000 (01:34 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions"
am: b5c4e80ecd

Change-Id: I2dcff4d7d0b0bdc5b344f08ce5d563da0a272ddf

commit | commitdiff | tree

Treehugger Robot [Sat, 17 Jun 2017 01:25:12 +0000 (01:25 +0000)]

Merge "Simplify NfcCommand and avoid NullPointerExceptions"

commit | commitdiff | tree

Jaewoong Jung [Sat, 17 Jun 2017 01:22:27 +0000 (01:22 +0000)]

Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev
am: 4f52665122

Change-Id: I7d78b51fbf568586f7fb9b3581eadae39b57304c

Import translations. DO NOT MERGE

Change-Id: Ifcfe6dcd80d6a3877a54a192fcdb019ed87fc99a
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 01:15:06 +0000 (01:15 +0000)]

Merge "Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d am: 730924cd65" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Felipe Leme [Sat, 17 Jun 2017 01:14:06 +0000 (01:14 +0000)]

Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d
am: 730924cd65

Change-Id: Ib6d0ed75d7ac5b7ae5c6785082710359e1b23f09

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 01:13:37 +0000 (01:13 +0000)]

Merge "Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9 am: 0da21f56e4" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 01:12:02 +0000 (01:12 +0000)]

Merge "Allows to change summary text in a custom view tile." into oc-dr1-dev

Embms download part 2

Add support for multi-part file downloads.
Improves destination directory handling in the download process.

Change-Id: Ibad57bab8804530ce09305424790d5520cd02071