From 09efb44d84e2396fbed334ae8ee66bcbc9cc023f Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Mon, 21 Jul 2014 09:56:58 +0800 Subject: [PATCH 1/9] Bug 1036861 - [MTP] Write file size into the response of getObjectInfo, r=dhylands In the response of operation GetObjectInfo, there is a field "ObjectCompressedSize". Currently it's assigned with 0. We need to put correct file size into it. I also corrected the type of property value in function getObjectPropertyDesc(). --- dom/system/gonk/MozMtpDatabase.cpp | 44 +++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/dom/system/gonk/MozMtpDatabase.cpp b/dom/system/gonk/MozMtpDatabase.cpp index 44b787a41ab6..893802ee2073 100644 --- a/dom/system/gonk/MozMtpDatabase.cpp +++ b/dom/system/gonk/MozMtpDatabase.cpp @@ -635,7 +635,13 @@ MozMtpDatabase::getObjectInfo(MtpObjectHandle aHandle, aInfo.mStorageID = entry->mStorageID; aInfo.mFormat = entry->mObjectFormat; aInfo.mProtectionStatus = 0x0; - aInfo.mCompressedSize = 0; + + if (entry->mObjectSize > 0xFFFFFFFFuLL) { + aInfo.mCompressedSize = 0xFFFFFFFFuLL; + } else { + aInfo.mCompressedSize = entry->mObjectSize; + } + aInfo.mThumbFormat = entry->mObjectFormat; aInfo.mThumbCompressedSize = 20*20*4; aInfo.mThumbPixWidth = 20; @@ -748,18 +754,36 @@ MozMtpDatabase::getObjectPropertyDesc(MtpObjectProperty aProperty, { MTP_LOG("Property: %s 0x%08x", ObjectPropertyAsStr(aProperty), aProperty); - // TODO: Perhaps Filesize should be 64-bit? - MtpProperty* result = nullptr; switch (aProperty) { - case MTP_PROPERTY_STORAGE_ID: result = new MtpProperty(aProperty, MTP_TYPE_UINT32); break; - case MTP_PROPERTY_OBJECT_FORMAT: result = new MtpProperty(aProperty, MTP_TYPE_UINT32); break; - case MTP_PROPERTY_OBJECT_SIZE: result = new MtpProperty(aProperty, MTP_TYPE_UINT32); break; - case MTP_PROPERTY_WIDTH: result = new MtpProperty(aProperty, MTP_TYPE_UINT32); break; - case MTP_PROPERTY_HEIGHT: result = new MtpProperty(aProperty, MTP_TYPE_UINT32); break; - case MTP_PROPERTY_IMAGE_BIT_DEPTH: result = new MtpProperty(aProperty, MTP_TYPE_UINT32); break; - case MTP_PROPERTY_DISPLAY_NAME: result = new MtpProperty(aProperty, MTP_TYPE_STR); break; + case MTP_PROPERTY_PROTECTION_STATUS: + result = new MtpProperty(aProperty, MTP_TYPE_UINT16); + break; + case MTP_PROPERTY_OBJECT_FORMAT: + result = new MtpProperty(aProperty, MTP_TYPE_UINT16, false, aFormat); + break; + case MTP_PROPERTY_STORAGE_ID: + case MTP_PROPERTY_PARENT_OBJECT: + case MTP_PROPERTY_WIDTH: + case MTP_PROPERTY_HEIGHT: + case MTP_PROPERTY_IMAGE_BIT_DEPTH: + result = new MtpProperty(aProperty, MTP_TYPE_UINT32); + break; + case MTP_PROPERTY_OBJECT_SIZE: + result = new MtpProperty(aProperty, MTP_TYPE_UINT64); + break; + case MTP_PROPERTY_DISPLAY_NAME: + result = new MtpProperty(aProperty, MTP_TYPE_STR); + break; + case MTP_PROPERTY_OBJECT_FILE_NAME: + result = new MtpProperty(aProperty, MTP_TYPE_STR, true); + break; + case MTP_PROPERTY_DATE_MODIFIED: + case MTP_PROPERTY_DATE_ADDED: + result = new MtpProperty(aProperty, MTP_TYPE_STR); + result->setFormDateTime(); + break; default: break; } From 1ea472f6efbb717a4d16b1ff9cf117cc74d6583b Mon Sep 17 00:00:00 2001 From: Eric Chou Date: Mon, 21 Jul 2014 09:57:04 +0800 Subject: [PATCH 2/9] Bug 1036863 - [MTP] Rename file/folder via MTP, r=dhylands This patch fixed 'unable to rename file/folder via MTP' by responding to MTP operation 'setObjectPropertyValue' correctly --- dom/system/gonk/MozMtpCommon.h | 2 + dom/system/gonk/MozMtpDatabase.cpp | 91 +++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dom/system/gonk/MozMtpCommon.h b/dom/system/gonk/MozMtpCommon.h index 72769f87f5c5..6ef801081a25 100644 --- a/dom/system/gonk/MozMtpCommon.h +++ b/dom/system/gonk/MozMtpCommon.h @@ -28,6 +28,7 @@ namespace android { class MOZ_EXPORT MtpServer; class MOZ_EXPORT MtpStorage; + class MOZ_EXPORT MtpStringBuffer; class MOZ_EXPORT MtpDatabase; class MOZ_EXPORT MtpDataPacket; class MOZ_EXPORT MtpProperty; @@ -39,6 +40,7 @@ namespace android { #include #include #include +#include #include #endif // mozilla_system_mtpcommon_h__ diff --git a/dom/system/gonk/MozMtpDatabase.cpp b/dom/system/gonk/MozMtpDatabase.cpp index 893802ee2073..29534d5089cf 100644 --- a/dom/system/gonk/MozMtpDatabase.cpp +++ b/dom/system/gonk/MozMtpDatabase.cpp @@ -29,6 +29,7 @@ ObjectPropertyAsStr(MtpObjectProperty aProperty) { switch (aProperty) { case MTP_PROPERTY_STORAGE_ID: return "MTP_PROPERTY_STORAGE_ID"; + case MTP_PROPERTY_OBJECT_FILE_NAME: return "MTP_PROPERTY_OBJECT_FILE_NAME"; case MTP_PROPERTY_OBJECT_FORMAT: return "MTP_PROPERTY_OBJECT_FORMAT"; case MTP_PROPERTY_OBJECT_SIZE: return "MTP_PROPERTY_OBJECT_SIZE"; case MTP_PROPERTY_WIDTH: return "MTP_PROPERTY_WIDTH"; @@ -102,6 +103,22 @@ MozMtpDatabase::BaseName(const nsCString& path) return path; } +static nsCString +GetPathWithoutFileName(const nsCString& aFullPath) +{ + nsCString path; + + int32_t offset = aFullPath.RFindChar('/'); + if (offset != kNotFound) { + // The trailing slash will be as part of 'path' + path = StringHead(aFullPath, offset + 1); + } + + MTP_LOG("returning '%s'", path.get()); + + return path; +} + void MozMtpDatabase::ParseDirectory(const char *aDir, MtpObjectHandle aParent) { @@ -353,14 +370,84 @@ MozMtpDatabase::getObjectPropertyValue(MtpObjectHandle aHandle, return MTP_RESPONSE_OK; } +static int +GetTypeOfObjectProp(MtpObjectProperty aProperty) +{ + struct PropertyTableEntry { + MtpObjectProperty property; + int type; + }; + + static const PropertyTableEntry kObjectPropertyTable[] = { + {MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32 }, + {MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16 }, + {MTP_PROPERTY_PROTECTION_STATUS, MTP_TYPE_UINT16 }, + {MTP_PROPERTY_OBJECT_SIZE, MTP_TYPE_UINT64 }, + {MTP_PROPERTY_OBJECT_FILE_NAME, MTP_TYPE_STR }, + {MTP_PROPERTY_DATE_MODIFIED, MTP_TYPE_STR }, + {MTP_PROPERTY_PARENT_OBJECT, MTP_TYPE_UINT32 }, + {MTP_PROPERTY_DISPLAY_NAME, MTP_TYPE_STR }, + {MTP_PROPERTY_DATE_ADDED, MTP_TYPE_STR }, + }; + + int count = sizeof(kObjectPropertyTable) / sizeof(kObjectPropertyTable[0]); + const PropertyTableEntry* entryProp = kObjectPropertyTable; + int type = 0; + + for (int i = 0; i < count; ++i, ++entryProp) { + if (entryProp->property == aProperty) { + type = entryProp->type; + break; + } + } + + return type; +} + //virtual MtpResponseCode MozMtpDatabase::setObjectPropertyValue(MtpObjectHandle aHandle, MtpObjectProperty aProperty, MtpDataPacket& aPacket) { - MTP_LOG("Handle: 0x%08x (NOT SUPPORTED)", aHandle); - return MTP_RESPONSE_OPERATION_NOT_SUPPORTED; + MTP_LOG("Handle: 0x%08x Property: 0x%08x", aHandle, aProperty); + + // Only support file name change + if (aProperty != MTP_PROPERTY_OBJECT_FILE_NAME) { + MTP_ERR("property 0x%x not supported", aProperty); + return MTP_RESPONSE_OBJECT_PROP_NOT_SUPPORTED; + } + + if (GetTypeOfObjectProp(aProperty) != MTP_TYPE_STR) { + MTP_ERR("property type 0x%x not supported", GetTypeOfObjectProp(aProperty)); + return MTP_RESPONSE_GENERAL_ERROR; + } + + RefPtr entry = GetEntry(aHandle); + if (!entry) { + MTP_ERR("Invalid Handle: 0x%08x", aHandle); + return MTP_RESPONSE_INVALID_OBJECT_HANDLE; + } + + MtpStringBuffer buf; + aPacket.getString(buf); + + nsDependentCString newFileName(buf); + nsCString newFileFullPath(GetPathWithoutFileName(entry->mPath) + newFileName); + + if (PR_Rename(entry->mPath.get(), newFileFullPath.get()) != PR_SUCCESS) { + MTP_ERR("Failed to rename '%s' to '%s'", + entry->mPath.get(), newFileFullPath.get()); + return MTP_RESPONSE_GENERAL_ERROR; + } + + MTP_LOG("renamed '%s' to '%s'", entry->mPath.get(), newFileFullPath.get()); + + entry->mPath = newFileFullPath; + entry->mObjectName = BaseName(entry->mPath); + entry->mDisplayName = entry->mObjectName; + + return MTP_RESPONSE_OK; } //virtual From 7c78bbc66943e221efdd90cdead769a11a2fbf8a Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Mon, 21 Jul 2014 10:44:09 +0800 Subject: [PATCH 3/9] Bug 1038026 - Fire onattributechanged event when adapter fails to turn on/off BT and restores state to Disabled/Enabled, r=echou --- dom/bluetooth2/BluetoothAdapter.cpp | 19 ++++++++++++++----- dom/bluetooth2/BluetoothAdapter.h | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dom/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth2/BluetoothAdapter.cpp index 7d0b0362aeff..42e7bf99d675 100644 --- a/dom/bluetooth2/BluetoothAdapter.cpp +++ b/dom/bluetooth2/BluetoothAdapter.cpp @@ -819,11 +819,7 @@ BluetoothAdapter::EnableDisable(bool aEnable, ErrorResult& aRv) } // Notify applications of adapter state change to Enabling/Disabling - nsTArray types; - BT_APPEND_ENUM_STRING(types, - BluetoothAdapterAttribute, - BluetoothAdapterAttribute::State); - DispatchAttributeEvent(types); + HandleAdapterStateChanged(); // Wrap runnable to handle result nsRefPtr result = @@ -832,8 +828,11 @@ BluetoothAdapter::EnableDisable(bool aEnable, ErrorResult& aRv) methodName); if(NS_FAILED(bs->EnableDisable(aEnable, result))) { + // Restore mState and notify applications of adapter state change mState = aEnable ? BluetoothAdapterState::Disabled : BluetoothAdapterState::Enabled; + HandleAdapterStateChanged(); + promise->MaybeReject(NS_ERROR_DOM_OPERATION_ERR); } @@ -894,6 +893,16 @@ BluetoothAdapter::IsAdapterAttributeChanged(BluetoothAdapterAttribute aType, } } +void +BluetoothAdapter::HandleAdapterStateChanged() +{ + nsTArray types; + BT_APPEND_ENUM_STRING(types, + BluetoothAdapterAttribute, + BluetoothAdapterAttribute::State); + DispatchAttributeEvent(types); +} + void BluetoothAdapter::HandlePropertyChanged(const BluetoothValue& aValue) { diff --git a/dom/bluetooth2/BluetoothAdapter.h b/dom/bluetooth2/BluetoothAdapter.h index 718bf7c0dca3..6be8f520a40f 100644 --- a/dom/bluetooth2/BluetoothAdapter.h +++ b/dom/bluetooth2/BluetoothAdapter.h @@ -193,6 +193,7 @@ private: bool IsAdapterAttributeChanged(BluetoothAdapterAttribute aType, const BluetoothValue& aValue); + void HandleAdapterStateChanged(); void HandlePropertyChanged(const BluetoothValue& aValue); void DispatchAttributeEvent(const nsTArray& aTypes); BluetoothAdapterAttribute From ca58e73ac0b70ec30d474fbd44c61df938d82289 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Jul 2014 21:35:32 -0700 Subject: [PATCH 4/9] Bumping gaia.json for 10 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d0bfe011a555 Author: Timothy Guan-tin Chien Desc: Merge pull request #21898 from timdream/keyboard-target-handler Bug 1035062 - Implement TargetHandlersManager, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/aa191e5108e0 Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part IX) Implement TargetHandlersManager ======== https://hg.mozilla.org/integration/gaia-central/rev/3128d765dc18 Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part VIII) Implement CandidatePanelManager ======== https://hg.mozilla.org/integration/gaia-central/rev/9ada807315de Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part VII) Remove resetScroll from IMERender.toggleCandidatePanel() ======== https://hg.mozilla.org/integration/gaia-central/rev/38a3acf3a372 Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part VI) Remove the NO_OP special keyCode ======== https://hg.mozilla.org/integration/gaia-central/rev/c45e1bbb0115 Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part V) Use state object in IMERender.setUpperCaseLock() ======== https://hg.mozilla.org/integration/gaia-central/rev/d823635bb36b Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part IV) Make setUpperCase take a state object ======== https://hg.mozilla.org/integration/gaia-central/rev/41aa02c39da0 Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part III) Remove resetUpperCase() ======== https://hg.mozilla.org/integration/gaia-central/rev/8608e6421d57 Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part II) Move double tap monitoring to ActiveTargetsManager ======== https://hg.mozilla.org/integration/gaia-central/rev/9aae290b5992 Author: Timothy Guan-tin Chien Desc: Bug 1035062 - (Part I) Remove unused isContinousSpacePressed remove unused variable --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 7d8cf5ce9714..800e68440897 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "cea1598e51f188fe8c48196cbb2c73aacbf3b1dc", + "revision": "d0bfe011a5551a9a6d090688035288e4d8a18b78", "repo_path": "/integration/gaia-central" } From f059ebbe7368e693c0393268c729cb3e423977f4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Jul 2014 21:41:17 -0700 Subject: [PATCH 5/9] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7eaf2a4a1083..7826bab22ee2 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 176f37de1aa6..6ac91ed20ce0 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7993f3c525a1..370a89fce0e8 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7eaf2a4a1083..7826bab22ee2 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d86a195d45e3..c254495162cc 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 34aaab40be5f..1a05eb0446b5 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9b42b4e8a1e2..7d7ad9f3040d 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 88b4befa39f4..82c8509facd1 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 62b9ca391f81..c345bf035a64 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7396f04cae6f882b19db2a3f7b96f63ed98414ab Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 21 Jul 2014 00:25:32 -0700 Subject: [PATCH 6/9] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e63ca851cb32 Author: Yuren Ju Desc: Merge pull request #21944 from wlach/1039739-2 Bug 1039739 - Make it more clear what command we're executing;r=yuren ======== https://hg.mozilla.org/integration/gaia-central/rev/d8802cfd38a5 Author: William Lachance Desc: Bug 1039739 - Make it more clear what command we're executing;r=yuren ======== https://hg.mozilla.org/integration/gaia-central/rev/0f061f41a849 Author: Yuren Ju Desc: Merge pull request #21841 from tenmilestereo/master Bug 1031998 - JSHint now throwing no errors r=@yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/a146f315d66b Author: Lewis Cowper Desc: Bug 1031998 - Fix jshint error for build/config/payment-dev-prefs.js --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 800e68440897..86d46297a38e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "d0bfe011a5551a9a6d090688035288e4d8a18b78", + "revision": "e63ca851cb32a199d23e1835957f9c31baf237e6", "repo_path": "/integration/gaia-central" } From d8349c1fe1bee7cf83a229e1569dbd1a5f04097e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 21 Jul 2014 00:31:20 -0700 Subject: [PATCH 7/9] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7826bab22ee2..c1522c4ed4da 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 6ac91ed20ce0..a5d080b3cff1 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 370a89fce0e8..8df6ed1fc73a 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7826bab22ee2..c1522c4ed4da 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index c254495162cc..d88c2382e46c 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 1a05eb0446b5..d2e295aab829 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 7d7ad9f3040d..9ce2c8d94150 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 82c8509facd1..300b22e7c55c 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c345bf035a64..37169d7d1996 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 5b3ffd37914ce2c60d29c5107934bb61f2aaae3c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 21 Jul 2014 01:25:32 -0700 Subject: [PATCH 8/9] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3112418e17e7 Author: Francisco Jordano Desc: Merge pull request #21955 from arcturus/bug-1038414 Bug 1038414 - [B2G][Contacts][Camera][273MB Flame] Camera app OOMs when adding picture to contact r=jmcf ======== https://hg.mozilla.org/integration/gaia-central/rev/f0ebb320d202 Author: Francisco Jordano Desc: Bug 1038414 - [B2G][Contacts][Camera][273MB Flame] Camera app OOMs when adding picture to contact --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 86d46297a38e..372ff702e706 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e63ca851cb32a199d23e1835957f9c31baf237e6", + "revision": "3112418e17e7f0b56dddb38316f6a448ec9c1e2a", "repo_path": "/integration/gaia-central" } From e9cd8b3cc0d200217b4916945a8a013bc58e925c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 21 Jul 2014 01:31:16 -0700 Subject: [PATCH 9/9] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c1522c4ed4da..87ebdb172ba2 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a5d080b3cff1..9add01bb250c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 8df6ed1fc73a..3a903c30b2ad 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c1522c4ed4da..87ebdb172ba2 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index d88c2382e46c..6a9ba80157be 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index d2e295aab829..68a0c3ff0d5f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9ce2c8d94150..2c270f905076 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 300b22e7c55c..33885afb9d93 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 37169d7d1996..7e41f32cbf2e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +